From 72baa9ea28900675484ccefdca2f7cba913c9c65 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 12 May 2025 11:33:04 +0200 Subject: [PATCH] Solved variable naming bugs, which exist because of big refactoring on friday --- group_vars/all/12_iam.yml | 2 +- roles/docker-attendize/vars/main.yml | 1 - roles/docker-coturn/vars/main.yml | 1 - roles/docker-friendica/vars/main.yml | 1 - roles/docker-fusiondirectory/templates/env.j2 | 2 +- roles/docker-lam/templates/env.j2 | 2 +- roles/docker-ldap/tasks/main.yml | 8 ++++---- roles/docker-ldap/vars/configuration.yml | 2 -- roles/docker-moodle/vars/main.yml | 1 - 9 files changed, 7 insertions(+), 13 deletions(-) diff --git a/group_vars/all/12_iam.yml b/group_vars/all/12_iam.yml index 68a33871..49aa0bb8 100644 --- a/group_vars/all/12_iam.yml +++ b/group_vars/all/12_iam.yml @@ -58,7 +58,7 @@ ldap: # Attribut to identify the user user_id: "uid" # Password to access dn.bind - bind_credential: "{{applications.ldap.administrator_database_password}}" + bind_credential: "{{applications.ldap.credentials.administrator_database_password}}" server: domain: "{{applications.ldap.hostname if applications.ldap.network.docker | bool else domains.ldap}}" # Mapping for public or locale access port: "{{_ldap_server_port}}" diff --git a/roles/docker-attendize/vars/main.yml b/roles/docker-attendize/vars/main.yml index 2433152c..06775cd7 100644 --- a/roles/docker-attendize/vars/main.yml +++ b/roles/docker-attendize/vars/main.yml @@ -1,5 +1,4 @@ --- application_id: "attendize" database_type: "mariadb" -database_password: "{{applications[application_id].credentials.database_password}}" docker_repository_address: "https://github.com/Attendize/Attendize.git" \ No newline at end of file diff --git a/roles/docker-coturn/vars/main.yml b/roles/docker-coturn/vars/main.yml index 2763974f..da2f976c 100644 --- a/roles/docker-coturn/vars/main.yml +++ b/roles/docker-coturn/vars/main.yml @@ -1,3 +1,2 @@ application_id: "coturn" -#database_password: "{{applications[application_id].credentials.database_password}}" #database_type: "mariadb" \ No newline at end of file diff --git a/roles/docker-friendica/vars/main.yml b/roles/docker-friendica/vars/main.yml index 64803208..2d13aea9 100644 --- a/roles/docker-friendica/vars/main.yml +++ b/roles/docker-friendica/vars/main.yml @@ -1,4 +1,3 @@ application_id: "friendica" -database_password: "{{ applications[application_id].credentials.database_password }}" database_type: "mariadb" no_validation: "{{ applications[application_id].features.oidc }}" # Email validation is not neccessary if OIDC is active \ No newline at end of file diff --git a/roles/docker-fusiondirectory/templates/env.j2 b/roles/docker-fusiondirectory/templates/env.j2 index 8fe70b81..0a42231f 100644 --- a/roles/docker-fusiondirectory/templates/env.j2 +++ b/roles/docker-fusiondirectory/templates/env.j2 @@ -2,7 +2,7 @@ # https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env # Basic Configuration -LAM_PASSWORD= {{applications[application_id].administrator_password}} # LAM configuration master password and password for server profile "lam +LAM_PASSWORD= {{applications[application_id].credentials.administrator_password}} # LAM configuration master password and password for server profile "lam # Database LAM_CONFIGURATION_DATABASE= files # configuration database (files or mysql) @todo implement mariadb diff --git a/roles/docker-lam/templates/env.j2 b/roles/docker-lam/templates/env.j2 index 8fe70b81..0a42231f 100644 --- a/roles/docker-lam/templates/env.j2 +++ b/roles/docker-lam/templates/env.j2 @@ -2,7 +2,7 @@ # https://github.com/LDAPAccountManager/lam/blob/develop/lam-packaging/docker/.env # Basic Configuration -LAM_PASSWORD= {{applications[application_id].administrator_password}} # LAM configuration master password and password for server profile "lam +LAM_PASSWORD= {{applications[application_id].credentials.administrator_password}} # LAM configuration master password and password for server profile "lam # Database LAM_CONFIGURATION_DATABASE= files # configuration database (files or mysql) @todo implement mariadb diff --git a/roles/docker-ldap/tasks/main.yml b/roles/docker-ldap/tasks/main.yml index 595e42ff..0af4eea1 100644 --- a/roles/docker-ldap/tasks/main.yml +++ b/roles/docker-ldap/tasks/main.yml @@ -8,13 +8,13 @@ src: "nginx.stream.conf.j2" dest: "{{nginx.directories.streams}}{{domains[application_id]}}.conf" notify: restart nginx - when: applications.ldap.network.public | bool + when: applications[application_id].network.public | bool - name: Remove {{domains[application_id]}}.conf if LDAP is not exposed to internet file: path: "{{ nginx.directories.streams }}{{ domains[application_id] }}.conf" state: absent - when: not applications.ldap.network.public | bool + when: not applications[application_id].network.public | bool - name: create docker network for LDAP, so that other applications can access it docker_network: @@ -53,8 +53,8 @@ include_tasks: create_nextcloud_schema.yml vars: ldap_server_uri: "ldap://127.0.0.1:{{ ports.localhost.ldap.ldap }}" - ldap_bind_dn: "cn={{ applications.ldap.users.administrator.username }},cn=config" - ldap_bind_pw: "{{ applications.ldap.administrator_password }}" + ldap_bind_dn: "cn={{ applications[application_id].users.administrator.username }},cn=config" + ldap_bind_pw: "{{ applications[application_id].credentials.administrator_password }}" ############################################################################### # 1) Create the LDAP entry if it does not yet exist diff --git a/roles/docker-ldap/vars/configuration.yml b/roles/docker-ldap/vars/configuration.yml index 7f94b2d6..fdb522ec 100644 --- a/roles/docker-ldap/vars/configuration.yml +++ b/roles/docker-ldap/vars/configuration.yml @@ -9,7 +9,5 @@ users: administrator: username: "{{users.administrator.username}}" # Administrator username credentials: -# administrator_password: # CHANGE for security reasons in inventory file -# administrator_database_password: # CHANGE for security reasons in inventory file features: ldap: true diff --git a/roles/docker-moodle/vars/main.yml b/roles/docker-moodle/vars/main.yml index 873016eb..a87afd0d 100644 --- a/roles/docker-moodle/vars/main.yml +++ b/roles/docker-moodle/vars/main.yml @@ -1,4 +1,3 @@ --- application_id: "moodle" -database_password: "{{applications[application_id].credentials.database_password}}" database_type: "mariadb" \ No newline at end of file