From 0295cf58727b88a13dd9f02f881150125d8817a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Mon, 28 Jun 2021 17:38:03 +0200 Subject: [PATCH] Add extra_app network if needed --- README.md | 1 + templates/inverseproxy.yaml.j2 | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/README.md b/README.md index a8e53a4..8c4181f 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ This role makes use of a few variables which are set in case the target server i * cloud_collabora and cloud_collabora_url * cloud_onlyoffice and cloud_onlyoffice_url * docker_odoo + * extra_app * metabase Note : all variables defined in defualts_main.yml might be useful in another role, in that case, it would be better to have them overwritten at play or host_vars level in order to make sure the same value is provided to each independant role diff --git a/templates/inverseproxy.yaml.j2 b/templates/inverseproxy.yaml.j2 index a19ee74..81c6248 100644 --- a/templates/inverseproxy.yaml.j2 +++ b/templates/inverseproxy.yaml.j2 @@ -6,6 +6,9 @@ services: environment: TZ: "{{ timezone }}" networks: +{% if odoo_prod.extra_app is defined or odoo_nonprod_instances[0].extra_app is defined %} + app: +{% endif %} shared: {% if inventory_hostname in groups['docker_auth'] | union(groups['docker_nagios']) or cloud_collabora or cloud_onlyoffice %} aliases: @@ -63,6 +66,12 @@ services: restart: unless-stopped networks: +{% if odoo_prod.extra_app is defined or odoo_nonprod_instances[0].extra_app is defined %} + app: + internal: true + driver_opts: + encrypted: 1 +{% endif %} shared: {% if restrict_internet_access %} internal: true -- GitLab