Restructuring for new backup solution

group_vars/all/13_ldap.yml

@@ -6,7 +6,11 @@
 # Helper Variables:
 # Keep in mind to mapp this variables if there is ever the possibility for the user to define them in the inventory
 _ldap_dn_base:                  "dc={{primary_domain_sld}},dc={{primary_domain_tld}}"
-_ldap_server_port:        "{% if applications['svc-db-openldap'].network.docker | bool %}{{ ports.localhost.ldap['svc-db-openldap'] }}{% else %}{{ ports.localhost.ldaps['svc-db-openldap'] }}{% endif %}"
+_ldap_docker_network_enabled:   "{{ applications | get_app_conf('svc-db-openldap', 'network.docker') }}"
+_ldap_protocol:                 "{{ 'ldap' if _docker_network_enabled else 'ldaps' }}"
+_ldap_server_port:              "{{ ports.localhost[_ldap_protocol]['svc-db-openldap'] }}"
+_ldap_name:                     "{{ applications | get_app_conf('svc-db-openldap', 'docker.services.openldap.name') }}"
+_ldap_domain:                   "domains | get_domain('svc-db-openldap')"
 _ldap_user_id:                  "uid"
 _ldap_filters_users_all:        "(|(objectclass=inetOrgPerson))"
 
@@ -55,14 +59,14 @@ ldap:
     #   for ordinary user/group operations, and vice versa.
 
   # Password to access dn.bind
-  bind_credential:      "{{ applications['svc-db-openldap'].credentials.administrator_database_password }}"
+  bind_credential:      "{{ applications | get_app_conf('svc-db-openldap', 'credentials.administrator_database_password') }}"
   server:
-    domain:             "{{applications['svc-db-openldap'].hostname if applications['svc-db-openldap'].network.docker | bool else domains['svc-db-openldap']}}" # Mapping for public or locale access
+    domain:             "{{ _ldap_name if _docker_network_enabled else _ldap_domain }}" # Mapping for public or locale access
     port:               "{{ _ldap_server_port }}"
-    uri:                "{% if applications['svc-db-openldap'].network.docker | bool %}ldap://{{ applications['svc-db-openldap'].hostname }}{% else %}ldaps://{{ domains['svc-db-openldap'] }}{% endif %}:{{ _ldap_server_port }}"
+    uri:                "{{ _ldap_protocol }}://{{ _ldap_name if _docker_network_enabled else _ldap_domain }}:{{ _ldap_server_port }}"
     security:           "" #TLS, SSL - Leave empty for none
   network:
-    local:              "{{applications['svc-db-openldap'].network.docker}}" # Uses the application configuration to define if local network should be available or not
+    local:              "{{ _docker_network_enabled }}" # Uses the application configuration to define if local network should be available or not
   user:
     objects:
       structural:

roles/cmp-rdbms/tasks/main.yml

@@ -1,5 +1,5 @@
 # The following env file will just be used from the dedicated mariadb container
-# and not the {{applications['svc-db-mariadb'].hostname }}
+# and not the central one
 - name: "For '{{ application_id }}': Create {{database_env}}"
   template: 
     src: "env/{{database_type}}.env.j2"

roles/cmp-rdbms/vars/database.yml

@@ -1,10 +1,15 @@
-database_id:        "svc-db-{{ database_type }}"
-database_instance:  "{{ applications | get_app_conf(database_id, 'hostname', True) if applications | get_app_conf(database_application_id, 'features.central_database', False) else database_application_id }}"
-database_host:      "{{ applications | get_app_conf(database_id, 'hostname', True) if applications | get_app_conf(database_application_id, 'features.central_database', False) else 'database' }}"
-database_name:      "{{ applications | get_app_conf(database_application_id, 'database.name', false, database_application_id ) }}"    # The overwritte configuration is needed by bigbluebutton
-database_username:  "{{ applications | get_app_conf(database_application_id, 'database.username', false, database_application_id )}}" # The overwritte configuration is needed by bigbluebutton
+# Helper variables
+_database_id:           "svc-db-{{ database_type }}"
+_database_central_name: "applications | get_app_conf( _database_id, 'docker.services.' ~ database_type ~ '.name')"
+_database_central_user: "{{ database_type }}"
+
+# Definition
+database_name:      "{{ applications | get_app_conf(database_application_id, 'database.name', false, _database_central_name ) }}"                                 # The overwritte configuration is needed by bigbluebutton
+database_instance:  "{{ _database_central_name if applications | get_app_conf(database_application_id, 'features.central_database', False) else database_name }}" # This could lead to bugs at dedicated database @todo cleanup
+database_host:      "{{ _database_central_name if applications | get_app_conf(database_application_id, 'features.central_database', False) else 'database' }}"    # This could lead to bugs at dedicated database @todo cleanup
+database_username:  "{{ applications | get_app_conf(database_application_id, 'database.username', false, _database_central_user )}}"                              # The overwritte configuration is needed by bigbluebutton
 database_password:  "{{ applications | get_app_conf(database_application_id, 'credentials.database_password', true) }}"
-database_port:      "{{ ports.localhost.database[ database_id ] }}"
+database_port:      "{{ ports.localhost.database[ _database_id ] }}"
 database_env:       "{{docker_compose.directories.env}}{{database_type}}.env"
 database_url_jdbc:  "jdbc:{{ database_type if database_type == 'mariadb' else 'postgresql' }}://{{ database_host }}:{{ database_port }}/{{ database_name }}"
 database_url_full:  "{{database_type}}://{{database_username}}:{{database_password}}@{{database_host}}:{{database_port}}/{{ database_name }}"

roles/docker-compose/templates/networks.yml.j2

@@ -2,7 +2,7 @@
 networks:
 {% if applications | get_app_conf(application_id, 'features.central_database', False) and database_type is defined %}
 
-  {{ applications[ 'svc-db-' ~ database_type ].network }}:
+  {{ applications | get_app_conf('svc-db-' ~ database_type, 'docker.network') }}:
     external: true
 {% endif %}
 {% if 

roles/docker-container/templates/networks.yml.j2

@@ -1,9 +1,9 @@
 {# This template needs to be included in docker-compose.yml containers #}
     networks:
-{% if applications | get_app_conf(application_id, 'features.central_database', False)| bool and database_type is defined %}
-      {{ applications[ 'svc-db-' ~ database_type ].network }}:
+{% if applications | get_app_conf(application_id, 'features.central_database', False) and database_type is defined %}
+      {{ applications | get_app_conf('svc-db-' ~ database_type, 'docker.network') }}:
 {% endif %}
-{% if applications | get_app_conf(application_id, 'features.ldap', False) | bool and applications['svc-db-openldap'].network.docker|bool %}
+{% if applications | get_app_conf(application_id, 'features.ldap', False) and applications | get_app_conf('svc-db-openldap', 'network.docker') %}
       svc-db-openldap:
 {% endif %}
       default:

roles/svc-db-mariadb/Administration.md

@@ -2,5 +2,6 @@
 
 ## Execute SQL commands
 ```bash
-docker exec -it {{applications['mariadb'].hostname }} mariadb -u root -p
+# Assume the container name is mariadb
+docker exec -it mariadb mariadb -u root -p
 ```

roles/svc-db-mariadb/config/main.yml

@@ -1,8 +1,11 @@
-hostname: "svc-db-mariadb"
-network:  "<< defaults_applications[svc-db-mariadb].hostname >>"
 docker:
   services:
     mariadb:
       version:          "latest"
       image:            "mariadb"
-      volume:   "<< defaults_applications[svc-db-mariadb].hostname >>_data"
+      name:             "mariadb"
+      backup:
+        datase_routine: true
+  network:              "mariadb"
+  volumes:
+    data:               "mariadb_data"

roles/svc-db-mariadb/tasks/init.yml

@@ -25,6 +25,6 @@
 # @todo Remove if this works fine in the future. 
 #- name: Grant database privileges
 #  ansible.builtin.shell:
-#    cmd: "docker exec {{mariadb_hostname }} mariadb -u root -p{{ mariadb_root_pwd }} -e \"GRANT ALL PRIVILEGES ON `{{database_name}}`.* TO '{{database_username}}'@'%';\""
+#    cmd: "docker exec {{mariadb_name }} mariadb -u root -p{{ mariadb_root_pwd }} -e \"GRANT ALL PRIVILEGES ON `{{database_name}}`.* TO '{{database_username}}'@'%';\""
 #  args:
 #    executable: /bin/bash

roles/svc-db-mariadb/tasks/main.yml

@@ -8,7 +8,7 @@
 
 - name: install MariaDB
   docker_container:
-    name: "{{ mariadb_hostname }}"
+    name: "{{ mariadb_name }}"
     image: "{{ mariadb_image }}:{{ mariadb_version}}"
     detach: yes
     env:
@@ -36,9 +36,9 @@
     state: present
   when: run_once_docker_mariadb is not defined
 
-- name: "Wait until the MariaDB container with hostname '{{ mariadb_hostname }}' is healthy"
+- name: "Wait until the MariaDB container with hostname '{{ mariadb_name }}' is healthy"
   community.docker.docker_container_info:
-    name: "{{ mariadb_hostname }}"
+    name: "{{ mariadb_name }}"
   register: db_info
   until:
   - db_info.containers is defined

roles/svc-db-mariadb/vars/main.yml

@@ -1,11 +1,10 @@
 application_id:       svc-db-mariadb
-mariadb_hostname:     "{{ applications | get_app_conf(application_id,'hostname', True) }}"
 mariadb_root_pwd:     "{{ applications | get_app_conf(application_id,'credentials.root_password', True) }}"
 mariadb_init:         "{{ database_username is defined and database_password is defined and database_name is defined }}"
 mariadb_subnet:       "{{ networks.local['svc-db-mariadb'].subnet  }}"
 mariadb_network_name: "{{ applications | get_app_conf(application_id,'network', True) }}"
-mariadb_volume:       "{{ applications | get_app_conf(application_id,'docker.services.mariadb.volume', True) }}"
+mariadb_volume:       "{{ applications | get_app_conf(application_id,'docker.volumes.data', True) }}"
 mariadb_image:        "{{ applications | get_app_conf(application_id,'docker.services.mariadb.image','mariadb', True) }}"
 mariadb_version:      "{{ applications | get_app_conf(application_id,'docker.services.mariadb.version', True) }}"
+mariadb_name:         "{{ applications | get_app_conf(application_id,'docker.services.mariadb.name', True) }}"
 mariadb_port:         "{{ database_port | default(ports.localhost.database[ application_id ]) }}"
-

roles/svc-db-openldap/config/main.yml

@@ -1,6 +1,4 @@
-hostname:         "svc-db-openldap"                   # Hostname of the LDAP Server in the ldap network
 network:
-  name:           "svc-db-openldap"                    
   local:          True                                # Activates local network. Necessary for LDIF import routines
   docker:         True                                # Activates docker network to allow other docker containers to connect
   public:         False                               # Set to true in inventory file if you want to expose the LDAP port to the internet
@@ -8,8 +6,12 @@ docker:
   services:
     openldap:     
       image:      "bitnami/openldap"
+      name:       "optenldap"
       version:    "latest"
-      container:  "<< defaults_applications[svc-db-openldap].hostname >>"
+  network:        "openldap"
+  volumes:
+    data:         "openldap_data"
+
 webinterface:     "lam"                               # The webinterface which should be used. Possible: lam and phpldapadmin
 features:
   ldap:           true

roles/svc-db-openldap/handlers/main.yml

@@ -1,6 +1,6 @@
 - name: Load memberof module from file in OpenLDAP container
   shell: >
-    docker exec -i {{ applications | get_app_conf(application_id, 'hostname', True) }} ldapmodify -Y EXTERNAL -H ldapi:/// -f {{openldap_ldif_docker_path}}configuration/01_member_of_configuration.ldif
+    docker exec -i {{ openldap_name }} ldapmodify -Y EXTERNAL -H ldapi:/// -f {{openldap_ldif_docker_path}}configuration/01_member_of_configuration.ldif
   listen: 
     - "Import configuration LDIF files"
     - "Import all LDIF files"
@@ -10,7 +10,7 @@
 
 - name: Refint Module Activation for OpenLDAP
   shell: >
-    docker exec -i {{ applications | get_app_conf(application_id, 'hostname', True) }} ldapadd -Y EXTERNAL -H ldapi:/// -f {{openldap_ldif_docker_path}}configuration/02_member_of_configuration.ldif
+    docker exec -i {{ openldap_name }} ldapadd -Y EXTERNAL -H ldapi:/// -f {{openldap_ldif_docker_path}}configuration/02_member_of_configuration.ldif
   listen: 
     - "Import configuration LDIF files"
     - "Import all LDIF files"
@@ -22,7 +22,7 @@
 
 - name: "Import schemas"
   shell: >
-    docker exec -i {{ applications | get_app_conf(application_id, 'hostname', True) }} ldapadd -Y EXTERNAL -H ldapi:/// -f "{{openldap_ldif_docker_path}}schema/{{ item | basename | regex_replace('\.j2$', '') }}"
+    docker exec -i {{ openldap_name }} ldapadd -Y EXTERNAL -H ldapi:/// -f "{{openldap_ldif_docker_path}}schema/{{ item | basename | regex_replace('\.j2$', '') }}"
   register: ldapadd_result
   changed_when: "'adding new entry' in ldapadd_result.stdout"
   failed_when: ldapadd_result.rc not in [0, 80]
@@ -33,7 +33,7 @@
 
 - name: Refint Overlay Configuration for OpenLDAP
   shell: >
-    docker exec -i {{ applications | get_app_conf(application_id, 'hostname', True) }} ldapmodify -Y EXTERNAL -H ldapi:/// -f {{openldap_ldif_docker_path}}configuration/03_member_of_configuration.ldif
+    docker exec -i {{ openldap_name }} ldapmodify -Y EXTERNAL -H ldapi:/// -f {{openldap_ldif_docker_path}}configuration/03_member_of_configuration.ldif
   listen:
     - "Import configuration LDIF files"
     - "Import all LDIF files"
@@ -45,7 +45,7 @@
 
 - name: "Import users, groups, etc. to LDAP"
   shell: >
-    docker exec -i {{ applications | get_app_conf(application_id, 'hostname', True) }} ldapadd -x -D "{{ldap.dn.administrator.data}}" -w "{{ldap.bind_credential}}" -c -f "{{openldap_ldif_docker_path}}data/{{ item | basename | regex_replace('\.j2$', '') }}"
+    docker exec -i {{ openldap_name }} ldapadd -x -D "{{ldap.dn.administrator.data}}" -w "{{ldap.bind_credential}}" -c -f "{{openldap_ldif_docker_path}}data/{{ item | basename | regex_replace('\.j2$', '') }}"
   register: ldapadd_result
   changed_when: "'adding new entry' in ldapadd_result.stdout"
   failed_when: ldapadd_result.rc not in [0, 20, 68, 65]

roles/svc-db-openldap/tasks/01_credentials.yml

@@ -3,7 +3,7 @@
 
 - name: "Query available LDAP databases"
   shell: |
-    docker exec {{ applications | get_app_conf(application_id, 'hostname', True) }} \
+    docker exec {{ openldap_name }} \
       ldapsearch -Y EXTERNAL -H ldapi:/// -LLL -b cn=config "(olcDatabase=*)" dn
   register: ldap_databases
 
@@ -27,13 +27,13 @@
 
 - name: "Generate hash for Database Admin password"
   shell: |
-    docker exec {{ applications | get_app_conf(application_id, 'hostname', True) }} \
+    docker exec {{ openldap_name }} \
       slappasswd -s "{{ ldap.bind_credential }}"
   register: database_admin_pw_hash
 
 - name: "Reset Database Admin password in LDAP (olcRootPW)"
   shell: |
-    docker exec -i {{ applications | get_app_conf(application_id, 'hostname', True) }} ldapmodify -Y EXTERNAL -H ldapi:/// <<EOF
+    docker exec -i {{ openldap_name }} ldapmodify -Y EXTERNAL -H ldapi:/// <<EOF
     dn: {{ data_backend_dn }}
     changetype: modify
     replace: olcRootPW
@@ -42,13 +42,13 @@
 
 - name: "Generate hash for Configuration Admin password"
   shell: |
-    docker exec {{ applications | get_app_conf(application_id, 'hostname', True) }} \
+    docker exec {{ openldap_name }} \
       slappasswd -s "{{ applications | get_app_conf(application_id, 'credentials.administrator_password', True) }}"
   register: config_admin_pw_hash
 
 - name: "Reset Configuration Admin password in LDAP (olcRootPW)"
   shell: |
-    docker exec -i {{ applications | get_app_conf(application_id, 'hostname', True) }} ldapmodify -Y EXTERNAL -H ldapi:/// <<EOF
+    docker exec -i {{ openldap_name }} ldapmodify -Y EXTERNAL -H ldapi:/// <<EOF
     dn: {{ config_backend_dn }}
     changetype: modify
     replace: olcRootPW

roles/svc-db-openldap/tasks/main.yml

@@ -19,7 +19,7 @@
 
 - name: create docker network for LDAP, so that other applications can access it
   docker_network:
-    name: "{{ applications | get_app_conf(application_id, 'network.name', True) }}"
+    name: "{{ applications | get_app_conf(application_id, 'network', True) }}"
     state: present
     ipam_config:
       - subnet: "{{ networks.local[application_id].subnet }}"

roles/svc-db-openldap/templates/docker-compose.yml.j2

@@ -2,7 +2,7 @@
 
   application:
     image: "{{ openldap_image }}:{{ openldap_version }}"
-    container_name: "{{ openldap_container }}"
+    container_name: "{{ openldap_name }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% if openldap_network_expose_local %}
     ports:

roles/svc-db-openldap/vars/main.yml

@@ -15,9 +15,9 @@ openldap_ldif_types:
   - data
   - schema                      # Don't know if this is still needed, it's now setup via tasks
 
-openldap_container:             "{{ applications | get_app_conf(application_id, 'docker.services.openldap.container', True) }}"
+openldap_name:                  "{{ applications | get_app_conf(application_id, 'docker.services.openldap.name', True) }}"
 openldap_image:                 "{{ applications | get_app_conf(application_id, 'docker.services.openldap.image', True) }}"
 openldap_version:               "{{ applications | get_app_conf(application_id, 'docker.services.openldap.version', True) }}"
-openldap_volume:                "{{ application_id }}_data"
+openldap_volume:                "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
 
 openldap_network_expose_local:  "{{ applications | get_app_conf(application_id, 'network.public', True) | bool or applications | get_app_conf(application_id, 'network.local', True) | bool }}"

roles/svc-db-postgres/Administration.md

@@ -1,7 +1,10 @@
 # Administration
 
 ## Root Access
+
 To access the database via the root account execute the following on the server:
+
 ```bash
-docker exec -it "{{ applications['postgres'].hostname }}" psql -U postgres
+# Assuming the container name is postgres
+docker exec -it postgres psql -U postgres
 ```

roles/svc-db-postgres/config/main.yml

@@ -1,11 +1,14 @@
-hostname: "svc-db-postgres"
-network:  "<< defaults_applications[svc-db-postgres].hostname >>"
 docker:
   services:
     postgres:
       # Postgis is necessary for mobilizon
       image:    postgis/postgis
+      name:     postgres
       # Please set an version in your inventory file! 
       # Rolling release isn't recommended
       version:  "latest"
-      volume:  "<< defaults_applications[svc-db-postgres].hostname >>_data"
+      backup:
+        datase_routine: true
+  volumes:
+    data:     "postgres_data"
+  network:    "postgres"

roles/svc-db-postgres/tasks/main.yml

@@ -8,7 +8,7 @@
 
 - name: Install PostgreSQL
   docker_container:
-    name: "{{ postgres_hostname }}"
+    name: "{{ postgres_name }}"
     image: "{{ postgres_image }}:{{ postgres_version }}"
     detach: yes
     env:
@@ -31,7 +31,7 @@
   when: run_once_docker_postgres is not defined
 
 - name: Wait for Postgres inside the container
-  shell: "docker exec {{ postgres_hostname }} pg_isready -U postgres"
+  shell: "docker exec {{ postgres_name }} pg_isready -U postgres"
   register: pg_ready
   until: pg_ready.rc == 0
   retries: 30

roles/svc-db-postgres/vars/main.yml

@@ -1,6 +1,6 @@
 application_id:         svc-db-postgres
-postgres_volume:        "{{ applications | get_app_conf(application_id, 'docker.services.postgres.volume', True) }}"
-postgres_hostname:      "{{ applications | get_app_conf(application_id, 'hostname', True) }}"
+postgres_volume:        "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
+postgres_name:          "{{ applications | get_app_conf(application_id, 'docker.services.postgres.name', True) }}"
 postgres_image:         "{{ applications | get_app_conf(application_id, 'docker.services.postgres.image', True) }}"
 postgres_subnet:        "{{ networks.local['svc-db-postgres'].subnet }}"
 postgres_network_name:  "{{ applications | get_app_conf(application_id, 'network', True) }}"

roles/update-docker/templates/update-docker.py.j2

@@ -125,22 +125,22 @@ def update_discourse(directory):
     """
     Updates Discourse by running the rebuild command on the launcher script.
     """
-    docker_repository_directory   = os.path.join(directory, "services", "{{applications.discourse.repository}}")
+    docker_repository_directory   = os.path.join(directory, "services", "{{ applications | get_app_conf('web-app-discourse','repository') }}")
     print(f"Using path {docker_repository_directory } to pull discourse repository.")
     os.chdir(docker_repository_directory )
     if git_pull():
         print("Start Discourse update procedure.")
-        update_procedure("docker stop {{applications.discourse.docker.service.discourse.name}}")
-        update_procedure("docker rm {{applications.discourse.docker.service.discourse.name}}")
+        update_procedure("docker stop {{ applications | get_app_conf('web-app-discourse','docker.services.discourse.name') }}")
+        update_procedure("docker rm {{ applications | get_app_conf('web-app-discourse','docker.services.discourse.name') }}")
         try:
-            update_procedure("docker network connect {{applications.discourse.network}} {{ applications['bpostgres'].hostname }}")
+            update_procedure("docker network connect {{ applications | get_app_conf('web-app-discourse','docker.network') }} {{ applications | get_app_conf('svc-db-postgres', 'docker.network') }}")
         except subprocess.CalledProcessError as e:
             error_message = e.output.decode()
             if "already exists" in error_message or "is already connected" in error_message:
                 print("Network connection already exists. Skipping...")
             else:
                 raise
-        update_procedure("./launcher rebuild {{applications.discourse.docker.service.discourse.name}}")
+        update_procedure("./launcher rebuild {{ applications | get_app_conf('web-app-discourse','docker.services.discourse.name') }}")
     else:
         print("Discourse update skipped. No changes in git repository.")
 

roles/web-app-akaunting/vars/main.yml

@@ -5,4 +5,4 @@ docker_repository_address:  "https://github.com/akaunting/docker.git"
 akaunting_version:          "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.version', True) }}"
 akaunting_image:            "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.image', True) }}"
 akaunting_name:             "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.name', True) }}"
-akaunting_volume:           "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+akaunting_volume:           "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"

roles/web-app-baserow/vars/main.yml

@@ -4,4 +4,4 @@ database_type:      "postgres"
 baserow_version:    "{{ applications | get_app_conf(application_id, 'docker.services.baserow.version', True) }}"
 baserow_image:      "{{ applications | get_app_conf(application_id, 'docker.services.baserow.image', True) }}"
 baserow_name:       "{{ applications | get_app_conf(application_id, 'docker.services.baserow.name', True) }}"
-baserow_volume:     "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+baserow_volume:     "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"

roles/web-app-discourse/tasks/main.yml

@@ -43,13 +43,13 @@
   meta: flush_handlers
   when: run_once_docker_discourse is not defined
 
-- name: "Connect {{ discourse_name }} to network {{ applications['svc-db-postgres'].network }}"
+- name: "Connect {{ discourse_name }} to network {{ applications | get_app_conf('svc-db-postgres', 'docker.network' ) }}"
   command: >
-    docker network connect {{ applications['svc-db-postgres'].network }} {{ discourse_name }}
+    docker network connect {{ applications | get_app_conf('svc-db-postgres', 'docker.network' ) }} {{ discourse_name }}
   register: network_connect
   failed_when: >
     network_connect.rc != 0 and
-    'Error response from daemon: endpoint with name {{ discourse_name }} already exists in network {{ applications["svc-db-postgres"].network }}'
+    "Error response from daemon: endpoint with name {{ discourse_name }} already exists in network {{ applications | get_app_conf('svc-db-postgres', 'docker.network' ) }}"
     not in network_connect.stderr
   changed_when: network_connect.rc == 0
   when:

roles/web-app-friendica/Administration.md

@@ -14,7 +14,8 @@ The following environment variables need to be defined for successful operation:
 
 To completely reset Friendica, including its database and volumes, run:
 ```bash
-docker exec -i {{applications['mariadb'].hostname }} mariadb -u root -p"${DB_ROOT_PASSWORD}" -e "DROP DATABASE IF EXISTS friendica; CREATE DATABASE friendica;"
+# Assuming containername is mariadb
+docker exec -i mariadb mariadb -u root -p"${DB_ROOT_PASSWORD}" -e "DROP DATABASE IF EXISTS friendica; CREATE DATABASE friendica;"
 docker compose down
 rm -rv /mnt/hdd/data/docker/volumes/friendica_data
 docker volume rm friendica_data
@@ -25,7 +26,7 @@ docker volume rm friendica_data
 ## Manual Method:
 1. Connect to the MariaDB instance:
    ```bash
-   docker exec -it {{applications['mariadb'].hostname }} mariadb -u root -p
+   docker exec -it mariadb mariadb -u root -p
    ```
 2. Run the following commands:
    ```sql
@@ -37,7 +38,7 @@ docker volume rm friendica_data
 ## Automatic Method:
 ```bash
 DB_ROOT_PASSWORD="your_root_password"
-docker exec -i {{applications['mariadb'].hostname }} mariadb -u root -p"${DB_ROOT_PASSWORD}" -e "DROP DATABASE IF EXISTS friendica; CREATE DATABASE friendica;"
+docker exec -i mariadb mariadb -u root -p"${DB_ROOT_PASSWORD}" -e "DROP DATABASE IF EXISTS friendica; CREATE DATABASE friendica;"
 ```
 
 ## Enter the Application Container 🔍

roles/web-app-mastodon/vars/main.yml

@@ -3,7 +3,7 @@ database_type:                "postgres"
 mastodon_version:             "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.version', True) }}"
 mastodon_image:               "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.image', True) }}"
 mastodon_name:                "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.name', True) }}"
-mastodon_volume:              "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+mastodon_volume:              "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
 mastodon_streaming_version:   "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.version', True) }}"
 mastodon_streaming_image:     "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.image', True) }}"
 mastodon_streaming_name:      "{{ applications | get_app_conf(application_id, 'docker.services.mastodon.name', True) }}_streaming"

roles/web-app-mediawiki/vars/main.yml

@@ -3,4 +3,4 @@ database_type:      "mariadb"
 mediawiki_version:   "{{ applications | get_app_conf(application_id, 'docker.services.mediawiki.version', True) }}"
 mediawiki_image:     "{{ applications | get_app_conf(application_id, 'docker.services.mediawiki.image', True) }}"
 mediawiki_name:      "{{ applications | get_app_conf(application_id, 'docker.services.mediawiki.name', True) }}"
-mediawiki_volume:    "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+mediawiki_volume:    "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"

roles/web-app-mybb/vars/main.yml

@@ -8,4 +8,4 @@ database_type:                                  "mariadb"
 mybb_version:                                   "{{ applications | get_app_conf(application_id, 'docker.services.mybb.version', True) }}"
 mybb_image:                                     "{{ applications | get_app_conf(application_id, 'docker.services.mybb.image', True) }}"
 mybb_name:                                      "{{ applications | get_app_conf(application_id, 'docker.services.mybb.name', True) }}"
-mybb_volume:                                    "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+mybb_volume:                                    "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"

roles/web-app-openproject/vars/main.yml

@@ -4,7 +4,7 @@ database_type:                "postgres"
 docker_repository:            true
 openproject_version:          "{{ applications | get_app_conf(application_id, 'docker.services.web.version', True) }}"
 openproject_image:            "{{ applications | get_app_conf(application_id, 'docker.services.web.image', True) }}"
-openproject_volume:           "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+openproject_volume:           "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
 openproject_web_name:         "{{ applications | get_app_conf(application_id, 'docker.services.web.name', True) }}"
 openproject_seeder_name:      "{{ applications | get_app_conf(application_id, 'docker.services.seeder.name', True) }}"
 openproject_cron_name:        "{{ applications | get_app_conf(application_id, 'docker.services.cron.name', True) }}"

roles/web-app-peertube/vars/main.yml

@@ -4,4 +4,4 @@ oidc_plugin:        "peertube-plugin-auth-openid-connect"
 peertube_version:   "{{ applications | get_app_conf(application_id, 'docker.services.peertube.version', True) }}"
 peertube_image:     "{{ applications | get_app_conf(application_id, 'docker.services.peertube.image', True) }}"
 peertube_name:      "{{ applications | get_app_conf(application_id, 'docker.services.peertube.name', True) }}"
-peertube_volume:    "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+peertube_volume:    "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"

roles/web-app-pgadmin/vars/main.yml

@@ -1,5 +1,5 @@
 application_id:               "pgadmin"
 database_type:                "postgres"
-database_host:                "{{ applications['svc-db-postgres'].hostname if applications | get_app_conf(application_id, 'features.central_database', False)}}"
+database_host:                "{{ applications | get_app_conf('svc-db-postgres', 'docker.services.postgres.name', True) if applications | get_app_conf(application_id, 'features.central_database', False) }}"
 pgadmin_user:                 5050
 pgadmin_group:                "{{ pgadmin_user }}"

roles/web-app-phpmyadmin/templates/env.j2

@@ -1,7 +1,7 @@
 # Configuration @see https://hub.docker.com/_/phpmyadmin
 
-PMA_HOST={{applications['svc-db-mariadb'].hostname}}
+PMA_HOST={{ applications | get_app_conf('svc-db-mariadb', 'docker.services.mariadb.name', True) }}
 {% if applications | get_app_conf(application_id, 'autologin', True) | bool %}
 PMA_USER= root
-PMA_PASSWORD= "{{applications['svc-db-mariadb'].credentials.root_password}}"
+PMA_PASSWORD= "{{ applications | get_app_conf('svc-db-mariadb', 'credentials.root_password', True) }}"
 {% endif %}

roles/web-app-phpmyadmin/vars/main.yml

@@ -1,3 +1,3 @@
 application_id:       "phpmyadmin"
 database_type:        "mariadb"
-database_host:        "{{ applications['svc-db-mariadb'].hostname if applications | get_app_conf(application_id, 'features.central_database', False)}}"
+database_host:        "{{ applications | get_app_conf('svc-db-mariadb', 'docker.services.mariadb.name', True) if applications | get_app_conf(application_id, 'features.central_database', False)}}"

roles/web-app-pixelfed/vars/main.yml

@@ -5,4 +5,4 @@ pixelfed_version:           "{{ applications | get_app_conf(application_id, 'doc
 pixelfed_image:             "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.image', True) }}"
 pixelfed_name:              "{{ applications | get_app_conf(application_id, 'docker.services.pixelfed.name', True) }}"
 pixelfed_worker_name:       "{{ applications | get_app_conf(application_id, 'docker.services.worker.name', True) }}"
-pixelfed_volume:            "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+pixelfed_volume:            "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"

roles/web-app-wordpress/tasks/plugins/wp-discourse.yml

@@ -12,7 +12,7 @@
 
 - name: Add /var/www/discourse to Git safe.directory
   command: >
-    docker exec {{ applications['web-app-discourse'].docker.service.discourse.name }} \
+    docker exec {{ applications['web-app-discourse'].docker.services.discourse.name }} \
       git config --global --add safe.directory /var/www/discourse
   args:
     chdir: "{{ docker_compose.directories.instance }}"
@@ -20,7 +20,7 @@
 
 - name: Revoke old WP Discourse API keys via Rails
   command: >
-    docker exec {{ applications['web-app-discourse'].docker.service.discourse.name }} bash -lc "\
+    docker exec {{ applications['web-app-discourse'].docker.services.discourse.name }} bash -lc "\
       cd /var/www/discourse && \
       script/rails runner \"\
         ApiKey.where(\
@@ -36,7 +36,7 @@
 
 - name: Generate new WP Discourse API key via Rake task
   command: >
-    docker exec {{ applications['web-app-discourse'].docker.service.discourse.name }} bash -lc "\
+    docker exec {{ applications['web-app-discourse'].docker.services.discourse.name }} bash -lc "\
       cd /var/www/discourse && \
       bin/rake api_key:create_master['WP Discourse Integration']\
     "

roles/web-app-wordpress/vars/main.yml

@@ -7,4 +7,4 @@ wordpress_docker_html_path: "/var/www/html"
 wordpress_version:          "{{ applications | get_app_conf(application_id, 'docker.services.wordpress.version', True) }}"
 wordpress_image:            "{{ applications | get_app_conf(application_id, 'docker.services.wordpress.image', True) }}"
 wordpress_name:             "{{ applications | get_app_conf(application_id, 'docker.services.wordpress.name', True) }}"
-wordpress_volume:           "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+wordpress_volume:           "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"

templates/roles/web-app/vars/main.yml.j2

@@ -7,4 +7,4 @@ docker_compose_flush_handlers:  true                 # When this is set to true
 {{ application_id | get_cymais_dir }}_version:   "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.{% endraw %}{{ application_id | get_cymais_dir }}{% raw %}.version',        True) }}"{% endraw %}
 {{ application_id | get_cymais_dir }}_image:     "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.{% endraw %}{{ application_id | get_cymais_dir }}{% raw %}.image',          True) }}"{% endraw %}
 {{ application_id | get_cymais_dir }}_name:      "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.{% endraw %}{{ application_id | get_cymais_dir }}{% raw %}.name',           True) }}"{% endraw %}
-{{ application_id | get_cymais_dir }}_volume:    "{% raw %}{{ applications | get_app_conf(application_id, 'docker.services.volumes.data',   True) }}"{% endraw %}
+{{ application_id | get_cymais_dir }}_volume:    "{% raw %}{{ applications | get_app_conf(application_id, 'docker.volumes.data',   True) }}"{% endraw %}

tests/integration/test_get_app_conf_paths.py

@@ -131,6 +131,27 @@ class TestGetAppConfPaths(unittest.TestCase):
                         break
                 if found:
                     continue
+
+                # Wildcard‑prefix: if the path ends with '.', treat it as a prefix
+                # and check for nested dicts in defaults_applications
+                if dotted.endswith('.'):
+                    prefix = dotted.rstrip('.')
+                    parts = prefix.split('.')
+                    for cfg in self.defaults_app.values():
+                        cur = cfg
+                        ok = True
+                        for p in parts:
+                            if isinstance(cur, dict) and p in cur:
+                                cur = cur[p]
+                            else:
+                                ok = False
+                                break
+                        if ok:
+                            found = True
+                            break
+                    if found:
+                        continue            
+
                 # credentials.*: zuerst in defaults_applications prüfen, dann im Schema
                 if dotted.startswith('credentials.'):
                     key = dotted.split('.', 1)[1]