Restructure and cleaned up in preparation of new backup logic

2025-08-29 15:06:26 +02:00 · 2025-07-15 23:51:51 +02:00
parent c8054ffbc3
commit af3ea9039c
106 changed files with 703 additions and 429 deletions
--- a/roles/web-app-matrix/templates/docker-compose.yml.j2
+++ b/roles/web-app-matrix/templates/docker-compose.yml.j2
@@ -1,23 +1,23 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
  synapse:
 {% set container_port = 8008 %}
-    image: "{{ applications | get_app_conf(application_id, 'images.synapse', True) }}"
-    container_name: matrix-synapse
+    image: "{{ matrix_synapse_image }}:{{ matrix_synapse_version }}"
+    container_name: {{ matrix_synapse_name }}
    restart: {{docker_restart_policy}}
    logging:
      driver: journald
    volumes:
      - synapse_data:/data
      - ./homeserver.yaml:/data/homeserver.yaml:ro
-      - ./{{domains.matrix.synapse}}.log.config:/data/{{domains.matrix.synapse}}.log.config:ro
+      - ./{{domains[application_id].synapse}}.log.config:/data/{{domains[application_id].synapse}}.log.config:ro
 {% for item in bridges %}
      - {{docker_compose.directories.instance}}mautrix/{{item.bridge_name}}/registration.yaml:{{registration_file_folder}}{{item.bridge_name}}.registration.yaml:ro
 {% endfor %}
    environment:
-      - SYNAPSE_SERVER_NAME={{domains.matrix.synapse}}
+      - SYNAPSE_SERVER_NAME={{domains[application_id].synapse}}
      - SYNAPSE_REPORT_STATS=no
    ports:
-      - "127.0.0.1:{{ports.localhost.http.matrix_synapse}}:{{ container_port }}"
+      - "127.0.0.1:{{ports.localhost.http['web-app-matrix_synapse']}}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 {% if bridges | length > 0 %}
 {% for item in bridges %}
@@ -30,13 +30,13 @@
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
  element:
 {% set container_port = 80 %}
-    image: "{{ applications | get_app_conf(application_id, 'images.element', True) }}"
-    container_name: matrix-element
+    image: "{{ matrix_element_image }}:{{ matrix_element_version }}"
+    container_name: {{ matrix_element_name }}
    restart: {{docker_restart_policy}}
    volumes:
      - ./element-config.json:/app/config.json
    ports:
-      - "127.0.0.1:{{ports.localhost.http.matrix_element}}:{{ container_port }}"
+      - "127.0.0.1:{{ports.localhost.http['web-app-matrix_element']}}:{{ container_port }}"
 {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}

@@ -81,7 +81,7 @@
      KEYV_URL: ''
      KEYV_BOT_ENCRYPTION: 'false'
      KEYV_BOT_STORAGE: 'true'
-      MATRIX_HOMESERVER_URL: 'https://{{domains.matrix.synapse}}'
+      MATRIX_HOMESERVER_URL: '{{ web_protocol }}://{{ domains[application_id].synapse }}'
      MATRIX_BOT_USERNAME: '@chatgptbot:{{applications | get_app_conf(application_id, 'server_name', True)}}'
      MATRIX_ACCESS_TOKEN: '{{ applications | get_app_conf(application_id, 'credentials.chatgpt_bridge_access_token', True) | default('') }}'
      MATRIX_BOT_PASSWORD: '{{applications | get_app_conf(application_id, 'credentials.chatgpt_bridge_user_password', True)}}'
@@ -98,8 +98,9 @@

 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
  synapse_data:
+    name: {{ matrix_synapse_data }}
 {% if applications | get_app_conf(application_id, 'plugins.chatgpt', True) | bool %}
-    chatgpt_data:
+  chatgpt_data:
 {% endif %}

 {% include 'roles/docker-compose/templates/networks.yml.j2' %}
--- a/roles/web-app-matrix/templates/element.config.json.j2
+++ b/roles/web-app-matrix/templates/element.config.json.j2
@@ -1,8 +1,8 @@
 {
    "default_server_config": {
        "m.homeserver": {
-            "base_url": "{{ web_protocol }}://{{domains.matrix.synapse}}",
-            "server_name": "{{domains.matrix.synapse}}"
+            "base_url": "{{ web_protocol }}://{{domains[application_id].synapse}}",
+            "server_name": "{{domains[application_id].synapse}}"
        },
        "m.identity_server": {
            "base_url": "{{ web_protocol }}://{{primary_domain}}"
--- a/roles/web-app-matrix/templates/mautrix/facebook.config.yml.j2
+++ b/roles/web-app-matrix/templates/mautrix/facebook.config.yml.j2
@@ -143,7 +143,7 @@ bridge:
    sync_direct_chat_list: false
    # Servers to always allow double puppeting from
    double_puppet_server_map:
-        {{applications | get_app_conf(application_id, 'server_name', True)}}: {{domains.matrix.synapse}}
+        {{applications | get_app_conf(application_id, 'server_name', True)}}: {{domains[application_id].synapse}}
    # Allow using double puppeting from any server with a valid client .well-known file.
    double_puppet_allow_discovery: false
    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
--- a/roles/web-app-matrix/templates/mautrix/instagram.config.yml.j2
+++ b/roles/web-app-matrix/templates/mautrix/instagram.config.yml.j2
@@ -134,7 +134,7 @@ bridge:
    double_puppet_allow_discovery: false
    # Servers to allow double puppeting from, even if double_puppet_allow_discovery is false.
    double_puppet_server_map:
-        {{applications | get_app_conf(application_id, 'server_name', True)}}: https://{{domains.matrix.synapse}}
+        {{applications | get_app_conf(application_id, 'server_name', True)}}: {{ web_protocol }}://{{ domains[application_id].synapse }}
    # Shared secret for https://github.com/devture/matrix-synapse-shared-secret-auth
    #
    # If set, custom puppets will be enabled automatically for local users
--- a/roles/web-app-matrix/templates/mautrix/signal.config.yml.j2
+++ b/roles/web-app-matrix/templates/mautrix/signal.config.yml.j2
@@ -141,7 +141,7 @@ bridge:
    federate_rooms: true
    # Servers to always allow double puppeting from
    double_puppet_server_map:
-        {{applications | get_app_conf(application_id, 'server_name', True)}}: https://{{domains.matrix.synapse}}
+        {{applications | get_app_conf(application_id, 'server_name', True)}}: {{ web_protocol }}://{{ domains[application_id].synapse }}
    # Allow using double puppeting from any server with a valid client .well-known file.
    double_puppet_allow_discovery: false
    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
--- a/roles/web-app-matrix/templates/mautrix/slack.config.yml.j2
+++ b/roles/web-app-matrix/templates/mautrix/slack.config.yml.j2
@@ -118,7 +118,7 @@ bridge:

    # Servers to always allow double puppeting from
    double_puppet_server_map:
-        {{applications | get_app_conf(application_id, 'server_name', True)}}: https://{{domains.matrix.synapse}}
+        {{applications | get_app_conf(application_id, 'server_name', True)}}: {{ web_protocol }}://{{ domains[application_id].synapse }}
    # Allow using double puppeting from any server with a valid client .well-known file.
    double_puppet_allow_discovery: false
    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
--- a/roles/web-app-matrix/templates/mautrix/telegram.config.yml.j2
+++ b/roles/web-app-matrix/templates/mautrix/telegram.config.yml.j2
@@ -198,7 +198,7 @@ bridge:
    sync_direct_chat_list: false
    # Servers to always allow double puppeting from
    double_puppet_server_map:
-        {{applications | get_app_conf(application_id, 'server_name', True)}}: https://{{domains.matrix.synapse}}
+        {{applications | get_app_conf(application_id, 'server_name', True)}}: {{ web_protocol }}://{{ domains[application_id].synapse }}
    # Allow using double puppeting from any server with a valid client .well-known file.
    double_puppet_allow_discovery: false
    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
--- a/roles/web-app-matrix/templates/mautrix/whatsapp.config.yml.j2
+++ b/roles/web-app-matrix/templates/mautrix/whatsapp.config.yml.j2
@@ -236,7 +236,7 @@ bridge:
    force_active_delivery_receipts: false
    # Servers to always allow double puppeting from
    double_puppet_server_map:
-        {{applications | get_app_conf(application_id, 'server_name', True)}}: https://{{domains.matrix.synapse}}
+        {{applications | get_app_conf(application_id, 'server_name', True)}}: {{ web_protocol }}://{{ domains[application_id].synapse }}
    # Allow using double puppeting from any server with a valid client .well-known file.
    double_puppet_allow_discovery: false
    # Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
--- a/roles/web-app-matrix/templates/nginx.conf.j2
+++ b/roles/web-app-matrix/templates/nginx.conf.j2
@@ -1,10 +1,10 @@
 server {
    {# Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary #}
    {# Could be that this is related to the set_fact use #}
-    {% set domain = domains.matrix.synapse %}
-    {% set http_port = ports.localhost.http.matrix_synapse %}
+    {% set domain = domains[application_id].synapse %}
+    {% set http_port = ports.localhost.http['web-app-matrix_synapse'] %}

-    server_name {{domains.matrix.synapse}};
+    server_name {{domains[application_id].synapse}};
    {% include 'roles/srv-web-7-7-letsencrypt/templates/ssl_header.j2' %}
    
    # For the federation port
--- a/roles/web-app-matrix/templates/synapse/homeserver.yaml.j2
+++ b/roles/web-app-matrix/templates/synapse/homeserver.yaml.j2
@@ -17,15 +17,15 @@ database:
    host: "{{database_host}}"
    cp_min: 5
    cp_max: 10
-log_config:                     "/data/{{domains.matrix.synapse}}.log.config"
+log_config:                     "/data/{{domains[application_id].synapse}}.log.config"
 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.matrix.synapse}}.signing.key"
-web_client_location:            "{{ web_protocol }}://{{domains.matrix.element}}"
-public_baseurl:                 "{{ web_protocol }}://{{domains.matrix.synapse}}"
+signing_key_path:               "/data/{{domains[application_id].synapse}}.signing.key"
+web_client_location:            "{{ web_protocol }}://{{domains[application_id].element}}"
+public_baseurl:                 "{{ web_protocol }}://{{domains[application_id].synapse}}"
 trusted_key_servers:
  - server_name: "matrix.org"
 admin_contact: 'mailto:{{ users.administrator.email }}'
@@ -39,10 +39,10 @@ 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.matrix.synapse}}"
+  app_name:                     "Matrix on {{domains[application_id].synapse}}"
  enable_notifs:                true
  notif_for_new_users:          false
-  client_base_url:              "{{domains.matrix.synapse}}"
+  client_base_url:              "{{domains[application_id].synapse}}"
  validation_token_lifetime:    15m

 {% if applications | get_app_conf(application_id, 'features.oidc', False) %}
--- a/roles/web-app-matrix/templates/synapse/log.config.j2
+++ b/roles/web-app-matrix/templates/synapse/log.config.j2
@@ -8,7 +8,7 @@ handlers:
  file:
    class: logging.handlers.RotatingFileHandler
    formatter: precise
-    filename: /data/{{domains.matrix.synapse}}.homeserver.log
+    filename: /data/{{domains[application_id].synapse}}.homeserver.log
    maxBytes: 10485760
    backupCount: 3
  console:
--- a/roles/web-app-matrix/templates/well-known.j2
+++ b/roles/web-app-matrix/templates/well-known.j2
@@ -1,3 +1,3 @@
 {
-    "m.server": "{{domains.matrix.synapse}}:{{ WEB_PORT }}"
+    "m.server": "{{domains[application_id].synapse}}:{{ WEB_PORT }}"
 }