THE HUGE REFACTORING CALENDER WEEK 33; Optimized Matrix and during this updated variables, and implemented better reset and cleanup mode handling, also solved some initial setup bugs

roles/web-app-matrix/templates/synapse/homeserver.yaml.j2

@@ -18,15 +18,15 @@ database:
     host: "{{database_host}}"
     cp_min: 5
     cp_max: 10
-log_config:                     "/data/{{domains[application_id].synapse}}.log.config"
+log_config:                     "{{ MATRIX_SYNAPSE_LOG_PATH_CONTAINER }}"
 media_store_path:               "/data/media_store"
 registration_shared_secret:     "{{applications | get_app_conf(application_id, 'credentials.registration_shared_secret', True)}}"
 report_stats:                   true
 macaroon_secret_key:            "{{applications | get_app_conf(application_id, 'credentials.macaroon_secret_key', True)}}"
 form_secret:                    "{{applications | get_app_conf(application_id, 'credentials.form_secret', True)}}"
-signing_key_path:               "/data/{{domains[application_id].synapse}}.signing.key"
+signing_key_path:               "/data/{{ MATRIX_SYNAPSE_DOMAIN }}.signing.key"
 web_client_location:            "{{ WEB_PROTOCOL }}://{{domains[application_id].element}}"
-public_baseurl:                 "{{ WEB_PROTOCOL }}://{{domains[application_id].synapse}}"
+public_baseurl:                 "{{ MATRIX_SYNAPSE_URL }}"
 trusted_key_servers:
   - server_name: "matrix.org"
 admin_contact: 'mailto:{{ users.administrator.email }}'
@@ -40,20 +40,20 @@ email:
   #require_transport_security:   true
   enable_tls:                   "{{ system_email.tls | upper }}"
   notif_from:                   "Your Friendly %(app)s homeserver <{{ users['no-reply'].email }}>"
-  app_name:                     "Matrix on {{domains[application_id].synapse}}"
+  app_name:                     "Matrix on {{ MATRIX_SYNAPSE_DOMAIN }}"
   enable_notifs:                true
   notif_for_new_users:          false
-  client_base_url:              "{{domains[application_id].synapse}}"
+  client_base_url:              "{{ MATRIX_SYNAPSE_DOMAIN }}"
   validation_token_lifetime:    15m
 
 {% if applications | get_app_conf(application_id, 'features.oidc', False) %}
 # @See https://matrix-org.github.io/synapse/latest/openid.html
 oidc_providers:
   - idp_id: keycloak
-    idp_name:       "{{oidc.button_text}}"
-    issuer:         "{{oidc.client.issuer_url}}"
-    client_id:      "{{oidc.client.id}}"
-    client_secret:  "{{oidc.client.secret}}"
+    idp_name:       "{{ oidc.button_text }}"
+    issuer:         "{{ oidc.client.issuer_url }}"
+    client_id:      "{{ oidc.client.id }}"
+    client_secret:  "{{ oidc.client.secret }}"
     scopes: ["openid", "profile"]
     user_mapping_provider:
       config:
@@ -62,9 +62,9 @@ oidc_providers:
     backchannel_logout_enabled: true
 {% endif %}
 
-{% if bridges | bool %}
+{% if MATRIX_BRIDGES | bool %}
 app_service_config_files:
-{% for item in bridges %}
-  - {{registration_file_folder}}{{item.bridge_name}}.registration.yaml
+{% for item in MATRIX_BRIDGES %}
+  - {{ MATRIX_REGISTRATION_FILE_FOLDER }}{{ item.bridge_name }}.registration.yaml
 {% endfor %}
 {% endif %}

roles/web-app-matrix/templates/synapse/log.config.j2

@@ -8,7 +8,7 @@ handlers:
   file:
     class: logging.handlers.RotatingFileHandler
     formatter: precise
-    filename: /data/{{domains[application_id].synapse}}.homeserver.log
+    filename: /data/{{ MATRIX_SYNAPSE_DOMAIN }}.homeserver.log
     maxBytes: 10485760
     backupCount: 3
   console: