Browse Source

fix: reverting to explicit relation to frontend and specification of domain name.

master
Valentin Lab 5 years ago
parent
commit
f04f5b0911
  1. 81
      compose.yml

81
compose.yml

@ -1,4 +1,4 @@
mydomain.org:
odoo:
charm: odoo-tecnativa charm: odoo-tecnativa
# docker-compose: # docker-compose:
# ## Important to keep as a list: otherwise it'll overwrite charm's arguments. # ## Important to keep as a list: otherwise it'll overwrite charm's arguments.
@ -9,19 +9,20 @@ mydomain.org:
# image: mynewimage # image: mynewimage
# options: # options:
# workers: 4 # 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
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: # # env:
# # ovh: # # ovh:
# # ## see: https://api.ovh.com/g934.first_step_with_api # # ## see: https://api.ovh.com/g934.first_step_with_api
@ -30,32 +31,32 @@ mydomain.org:
# # key: XXX # # key: XXX
# # secret: YYY # # secret: YYY
# # consumer_key: ZZZ # # 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-----
# 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: frontend:

Loading…
Cancel
Save