Added 'group_domain_filters' draft(needs to be optimized to load dependencies)

roles/docker-bluesky/tasks/main.yml

@@ -10,8 +10,8 @@
     domain: "{{ item.domain }}"
     http_port: "{{ item.http_port }}"
   loop:
-    - { domain: domains.bluesky_api, http_port: ports.localhost.http.bluesky_api }
-    - { domain: domains.bluesky_web, http_port: ports.localhost.http.bluesky_web }
+    - { domain: domains.[application_id]['api'], http_port: ports.localhost.http.bluesky_api }
+    - { domain: domains.[application_id]['web'], http_port: ports.localhost.http.bluesky_web }
 
 # The following lines should be removed when the following issue is closed:
 # https://github.com/bluesky-social/pds/issues/52

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

@@ -22,8 +22,8 @@ services:
       dockerfile: Dockerfile 
       # It doesn't compile yet with this parameters. @todo Fix it
       args:
-        REACT_APP_PDS_URL: "{{ web_protocol }}://{{domains.bluesky_api}}" # URL des PDS
-        REACT_APP_API_URL: "{{ web_protocol }}://{{domains.bluesky_api}}" # API-URL des PDS
+        REACT_APP_PDS_URL: "{{ web_protocol }}://{{domains.[application_id]['api']}}" # URL des PDS
+        REACT_APP_API_URL: "{{ web_protocol }}://{{domains.[application_id]['api']}}" # API-URL des PDS
         REACT_APP_SITE_NAME: "{{primary_domain | upper}} - Bluesky"
         REACT_APP_SITE_DESCRIPTION: "Decentral Social "
     ports:

roles/docker-bluesky/templates/env.j2

@@ -1,6 +1,6 @@
-PDS_HOSTNAME="{{domains.bluesky_api}}"
+PDS_HOSTNAME="{{domains.[application_id]['api']}}"
 PDS_ADMIN_EMAIL="{{applications.bluesky.users.administrator.email}}"
-PDS_SERVICE_DID="did:web:{{domains.bluesky_api}}"
+PDS_SERVICE_DID="did:web:{{domains.[application_id]['api']}}"
 
 # See https://mattdyson.org/blog/2024/11/self-hosting-bluesky-pds/
 PDS_SERVICE_HANDLE_DOMAINS=".{{primary_domain}}"
@@ -15,7 +15,7 @@ PDS_BLOBSTORE_DISK_LOCATION=/opt/pds/blocks
 PDS_DATA_DIRECTORY: /opt/pds
 PDS_BLOB_UPLOAD_LIMIT: 52428800
 PDS_DID_PLC_URL=https://plc.directory
-PDS_BSKY_APP_VIEW_URL=https://{{domains.bluesky_web}}
-PDS_BSKY_APP_VIEW_DID=did:web:{{domains.bluesky_web}}
+PDS_BSKY_APP_VIEW_URL=https://{{domains.[application_id]['web']}}
+PDS_BSKY_APP_VIEW_DID=did:web:{{domains.[application_id]['web']}}
 PDS_REPORT_SERVICE_URL=https://mod.bsky.app
 PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac

roles/docker-mastodon/tasks/main.yml

@@ -6,7 +6,7 @@
 - name: "Include setup for domain '{{ domain }}'"
   include_role: 
     name: nginx-domain-setup
-  loop: "{{ [domains.mastodon] + domains.mastodon_alternates }}"
+  loop: "{{ domains.mastodon }}"
   loop_control:
     loop_var: domain
   vars:

roles/docker-mastodon/templates/env.j2

@@ -4,7 +4,7 @@
 
 
 LOCAL_DOMAIN={{domains[application_id]}}
-ALTERNATE_DOMAINS="{{ domains.mastodon_alternates | join(',') }}"
+ALTERNATE_DOMAINS="{{ domains.mastodon[1:] | join(',') }}"
 SINGLE_USER_MODE={{applications.mastodon.single_user_mode}}
 
 # Credentials

roles/docker-matrix/vars/configuration.yml

@@ -25,9 +25,9 @@ csp:
   whitelist:
     connect-src:
       - "{{ primary_domain }}"
-      - "{{ domains.synapse }}"
+      - "{{ domains.matrix }}"
     script-src:
-      - "{{ domains.synapse }}"
+      - "{{ domains.matrix }}"
       - "https://cdn.jsdelivr.net"
 plugins:
 # You need to enable them in the inventory file

roles/docker-peertube/tasks/main.yml

@@ -5,7 +5,7 @@
   
 - name: "include create-domains.yml for peertube"
   include_tasks: create-domains.yml
-  loop: "{{ [domains.peertube] + domains.peertube_alternates }}"
+  loop: "{{ domains.peertube }}"
   loop_control:
     loop_var: domain
   vars: