Browse Source

new: delete all auto-pair relation and values that are defaulted by relations.

master
Valentin Lab 6 years ago
parent
commit
08c99973e9
  1. 45
      compose.yml

45
compose.yml

@ -1,8 +1,5 @@
odoo:
mydomain.org:
charm: odoo-tecnativa
options:
admin-password: rantanplan
# docker-compose:
# ## Important to keep as a list: otherwise it'll overwrite charm's arguments.
# command:
@ -13,11 +10,9 @@ odoo:
# image: mynewimage
relations:
log-rotate: logrotate
postgres-database: postgres
web-proxy:
frontend:
domain: mydomain.org
#domain: mydomain.org
#server-aliases:
# - mydomain2.org
apache-custom-rules: |
@ -30,9 +25,9 @@ odoo:
#ProxyPass /longpolling/ http://odoo:8072/longpolling/
#ProxyPassReverse /longpolling/ http://odoo:8072/longpolling/
ssl:
letsencrypt:
challenge-type: http ## if 'dns', be sure to prepare 'env' correctly
# 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
@ -77,12 +72,10 @@ odoo:
# vRt4kR4KG6ULXrmsRA4WQjBDJ9vZw2aK+w==
# -----END PRIVATE KEY-----
postgres:
frontend:
charm: apache
relations:
log-rotate: logrotate
cert-provider: letsencrypt
letsencrypt:
@ -98,31 +91,21 @@ letsencrypt:
# key: XXX
# secret: YYY
# consumer_key: ZZZ
relations:
log-rotate: logrotate
schedule-command:
cron: ## will schedule renew of certs every week
schedule: "30 3 * * 7" ## min hour day-of-month month day-of-week
## Cron is present (even if empty) to add it automatically to any
## ``compose up`` (without arguments).
cron:
relations:
log-rotate: logrotate
logrotate:
relations:
schedule-command: cron ## schedule log rotation of all registered services daily
# mattermost:
# mattermost.mydomain.org:
# charm: mattermost
# relations:
# web-proxy:
# frontend:
# domain: mattermost.local ## <-- modify this
# ssl: letsencrypt
# apache-custom-rules: |
# ProxyPreserveHost On
#
@ -131,18 +114,14 @@ logrotate:
# RewriteCond %{REQUEST_URI} /api/v[0-9]+/(users/)?websocket [NC,OR]
# RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR]
# RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC]
# RewriteRule .* ws://mattermost:8000%{REQUEST_URI} [P,QSA,L]
# postgres-database:
# postgres:
# user: mattermost
# dbname: mattermost
# RewriteRule .* ws://mattermost.mydomain.org:8000%{REQUEST_URI} [P,QSA,L]
# postgres-database: postgres
# bitwarden:
# bitwarden.mydomain.org:
# relations:
# web-proxy:
# frontend:
# domain: bitwarden.mydomain.com
# ## We need to specify here the port as it can't be infered easily as
# ## there are 2 ports exposed by the image.
# target: bitwarden:80
# ssl: letsencrypt
# target: bitwarden.mydomain.org:80
Loading…
Cancel
Save