Solved application_id overwritting bug

filter_plugins/canonical_domains_map.py

@@ -18,7 +18,10 @@ class FilterModule(object):
         seen_domains = {}
 
         for app_id, cfg in apps.items():
-            if app_id.startswith(("web-")):
+            if app_id.startswith((
+                    "web-",
+                    "svc-db-"   # Database services can also be exposed to the internet. It is just listening to the port, but the domain is used for port mapping
+                    )):
                 if not isinstance(cfg, dict):
                     raise AnsibleFilterError(
                     f"Invalid configuration for application '{app_id}': "

requirements.txt

@@ -3,4 +3,7 @@ numpy
 bcrypt
 ruamel.yaml
 tld
-passlib
+passlib
+requests
+ansible
+pytest

requirements.yml

@@ -1,10 +1,5 @@
 collections:
   - name: kewlfft.aur
   - name: community.general
-pacman:
-# Propably it makes sense to move the following to the requirements.txt to just install it in the python venv
-  - ansible
-  - python-passlib
-  - python-pytest
 yay:
   - python-simpleaudio

roles/cmp-docker-proxy/tasks/main.yml

@@ -1,6 +1,6 @@
 # run_once_cmp_docker_proxy: deactivated
 
-# To load the proxy firs is just implemented due to some issues with BBB
+# To load the proxy first is just implemented due to some issues with BBB
 - name: "For '{{ application_id }}': include role srv-proxy-6-6-domain"
   include_role:
     name: srv-proxy-6-6-domain

roles/srv-web-7-4-core/tasks/main.yml

@@ -1,18 +1,10 @@
 ---
-
-- name: "Store 'application_id' : {{ application_id }}"
-  set_fact:
-    original_application_id: "{{ application_id }}"
-  when: run_once_srv_web_core is not defined
-
 - name: Include openresty
   include_role: 
     name: svc-prx-openresty
-  when: run_once_srv_web_core is not defined
-
-- name: "Restore 'application_id':\n Current: {{ application_id }}\n Restored: {{ original_application_id }}"
-  set_fact:
-    application_id: "{{ original_application_id }}"
+    public: false 
+    # Explicit set to guaranty that application_id will not be overwritten. 
+    # Should be anyhow the default case
   when: run_once_srv_web_core is not defined
 
 - name: "reset (if enabled)"

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

@@ -4,6 +4,9 @@ application_id:                 svc-db-postgres
 # Docker
 docker_compose_flush_handlers:  true
 
+# Docker Compose
+database_type:                  "{{ application_id | get_entity_name }}"
+
 ## Postgres
 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) }}"

roles/web-app-keycloak/config/main.yml

@@ -1,12 +1,12 @@
 import_realm:         True                                # If True realm will be imported. If false skip.
 features:
   matomo:             true
-  css:                false
+  css:                true
   port-ui-desktop:    true
   ldap:               true
   central_database:   true
   recaptcha:          true
-  logout:   true
+  logout:             true
 csp:
   flags:
     script-src-elem:

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

@@ -22,4 +22,10 @@ KC_DB_PASSWORD=                 {{database_password}}
 
 # If the initial administrator already exists and the environment variables are still present at startup, an error message stating the failed creation of the initial administrator is shown in the logs. Keycloak ignores the values and starts up correctly.
 KC_BOOTSTRAP_ADMIN_USERNAME=    "{{applications | get_app_conf(application_id, 'users.administrator.username', True)}}"
-KC_BOOTSTRAP_ADMIN_PASSWORD=    "{{applications | get_app_conf(application_id, 'credentials.administrator_password', True)}}"
+KC_BOOTSTRAP_ADMIN_PASSWORD=    "{{applications | get_app_conf(application_id, 'credentials.administrator_password', True)}}"
+
+# Enable detailed logs
+{% if enable_debug | bool %}
+KC_LOG_LEVEL=DEBUG
+KC_LOG_CONSOLE_ENABLED=true
+{% endif %}

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

@@ -1,6 +1,9 @@
 ---
+# General
 application_id:       "web-app-matomo"
 database_type:        "mariadb"
+
+# Matomo
 matomo_excluded_ips:  "{{ applications | get_app_conf(application_id, 'excluded_ips', True) }}"
 matomo_index_php_url: "{{ domains | get_url(application_id, web_protocol) }}/index.php"
 matomo_auth_token:    "{{ applications | get_app_conf(application_id, 'credentials.auth_token', True) }}"

roles/web-svc-simpleicons/tasks/main.yml

@@ -10,7 +10,7 @@
     dest: "{{ item.target }}"
     mode: '0755'
   loop:
-    - { source: "server.js.j2",    target: "{{ simpleicons_host_server_file }}" }
+    - { source: "server.js.j2",     target: "{{ simpleicons_host_server_file }}" }
     - { source: "package.json.j2",  target: "{{ simpleicons_host_package_file }}" }
   notify:
     - docker compose up