From cb53633917263884f1c440a8f636947f43d60720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Mon, 6 Jan 2025 13:51:47 +0100
Subject: [PATCH] [FIX] remove old inventory groups
---
README.md | 7 ++-----
templates/inverseproxy.yaml.j2 | 8 ++------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 77bcc23..7b655cf 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,7 @@ Variables defined in defaults/main.yaml:
* allow_iframe: whether iframes are allowed
This role makes use of a few variables which are set in case the target server is part of other groups (but still initialized to false in defaults/main.yml), namely :
-* docker_auth
- * ldap_url
- * sso_url
-* docker_nextcloud or docker_owncloud
+* docker_nextcloud
* cloud_url
* cloud_collabora and cloud_collabora_url
* cloud_onlyoffice and cloud_onlyoffice_url
@@ -64,7 +61,7 @@ Dependencies
This role requires the following Ansible collection :
* community.docker
-This role does not have dependencies per-se, while it can be dependant on variables defined in other groups (backup_servers, docker_auth, docker_nextcloud, docker_odoo, docker_owncloud)
+This role does not have dependencies per-se, while it can be dependant on variables defined in other groups (backup_servers, docker_nextcloud, docker_odoo)
Example Playbook
----------------
diff --git a/templates/inverseproxy.yaml.j2 b/templates/inverseproxy.yaml.j2
index 5592533..224f5fe 100644
--- a/templates/inverseproxy.yaml.j2
+++ b/templates/inverseproxy.yaml.j2
@@ -11,16 +11,12 @@ services:
app:
{% endif %}
shared:
-{% if inventory_hostname in groups['docker_auth'] | union(groups['docker_nagios']) or cloud_collabora or cloud_onlyoffice %}
+{% if inventory_hostname in groups['docker_nagios'] or cloud_collabora or cloud_onlyoffice %}
aliases:
-{% if inventory_hostname in groups['docker_auth'] %}
- - {{ ldap_url }}
- - {{ sso_url }}
-{% endif %}
{% if inventory_hostname in groups['docker_nagios'] %}
- {{ nagios_url }}
{% endif %}
-{% if inventory_hostname in groups['docker_nextcloud'] | union(groups['docker_owncloud']) %}
+{% if inventory_hostname in groups['docker_nextcloud'] %}
- {{ cloud_url }}
{% if cloud_collabora %}
- {{ cloud_collabora_url }}
--
GitLab