From f04f5b091100268decf921936b80a7eaf9590ebb Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Fri, 13 Sep 2019 17:11:20 +0200 Subject: [PATCH] fix: reverting to explicit relation to frontend and specification of domain name. --- compose.yml | 97 +++++++++++++++++++++++++++-------------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/compose.yml b/compose.yml index c879dfe..ba0f007 100644 --- a/compose.yml +++ b/compose.yml @@ -1,4 +1,4 @@ -mydomain.org: +odoo: charm: odoo-tecnativa # docker-compose: # ## Important to keep as a list: otherwise it'll overwrite charm's arguments. @@ -9,53 +9,54 @@ mydomain.org: # image: mynewimage # options: # workers: 4 - # relations: - # web-proxy: - # frontend: - # #domain: mydomain.org - # #server-aliases: - # # - mydomain2.org - # # apache-custom-rules: - # # - | - # # ## Apache special rules ? - # # # - # # ssl: - # # letsencrypt: - # # challenge-type: http ## if 'dns', be sure to prepare 'env' correctly - # # env: - # # ovh: - # # ## see: https://api.ovh.com/g934.first_step_with_api - # # entrypoint: ovh-eu - # # application: - # # key: XXX - # # secret: YYY - # # consumer_key: ZZZ - # # ssl: true ## simple auto-signed SSL certificates - # # ssl: - # # ca-cert: - # # -----BEGIN CERTIFICATE----- - # # MIIF6TCCA9GgAwIBAgIQBeTcO5Q4qzuFl8umoZhQ4zANBgkqhkiG9w0BAQwFADCB - # # ... - # # BT02Vf6Dsuimrdfp5gJ0iHRc2jTbkNJtUQoj1iM= - # # -----END CERTIFICATE----- - # # -----BEGIN CERTIFICATE----- - # # MIIFdzCCBF+gAwIBAgIQE+oocFv07O0MNmMJgGFDNjANBgkqhkiG9w0BAQwFADBv - # # ... - # # 0fKtirOMxyHNwu8= - # # -----END CERTIFICATE----- - # # cert: | - # # -----BEGIN CERTIFICATE----- - # # MIIF/TCCBOWgAwIBAgIRALUydpTpCApfYMuJchDJv5AwDQYJKoZIhvcNAQELBQAw - # # ... - # # Xs5S6mr0T6Dqx6MQkPATSsEEJlLH5wq3DxXQcrMqnM/WHMRYUCkoTl37sXplflHe - # # jw== - # # -----END CERTIFICATE----- - # # key: | - # # -----BEGIN PRIVATE KEY----- - # # MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDONqqTCS4CiSi/ - # # ... - # # vRt4kR4KG6ULXrmsRA4WQjBDJ9vZw2aK+w== - # # -----END PRIVATE KEY----- + relations: + web-proxy: + frontend: + domain: mydomain.org + # server-aliases: + # - mydomain2.org + # - mydomain3.org + # apache-custom-rules: + # - | + # ## Apache special rules ? + # # + # ssl: + # letsencrypt: + # challenge-type: http ## if 'dns', be sure to prepare 'env' correctly + # # env: + # # ovh: + # # ## see: https://api.ovh.com/g934.first_step_with_api + # # entrypoint: ovh-eu + # # application: + # # key: XXX + # # secret: YYY + # # consumer_key: ZZZ + # ssl: true ## simple auto-signed SSL certificates + # ssl: + # ca-cert: + # -----BEGIN CERTIFICATE----- + # MIIF6TCCA9GgAwIBAgIQBeTcO5Q4qzuFl8umoZhQ4zANBgkqhkiG9w0BAQwFADCB + # ... + # BT02Vf6Dsuimrdfp5gJ0iHRc2jTbkNJtUQoj1iM= + # -----END CERTIFICATE----- + # -----BEGIN CERTIFICATE----- + # MIIFdzCCBF+gAwIBAgIQE+oocFv07O0MNmMJgGFDNjANBgkqhkiG9w0BAQwFADBv + # ... + # 0fKtirOMxyHNwu8= + # -----END CERTIFICATE----- + # cert: | + # -----BEGIN CERTIFICATE----- + # MIIF/TCCBOWgAwIBAgIRALUydpTpCApfYMuJchDJv5AwDQYJKoZIhvcNAQELBQAw + # ... + # Xs5S6mr0T6Dqx6MQkPATSsEEJlLH5wq3DxXQcrMqnM/WHMRYUCkoTl37sXplflHe + # jw== + # -----END CERTIFICATE----- + # key: | + # -----BEGIN PRIVATE KEY----- + # MIIJRQIBADANBgkqhkiG9w0BAQEFAASCCS8wggkrAgEAAoICAQDONqqTCS4CiSi/ + # ... + # vRt4kR4KG6ULXrmsRA4WQjBDJ9vZw2aK+w== + # -----END PRIVATE KEY----- frontend: