From 7756bbfd626a20671511880644552d7e50a8621f Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Sat, 17 May 2025 10:51:06 +0200
Subject: [PATCH] Changed bluesky domain naming

---
 group_vars/all/15_about.yml                          | 2 +-
 roles/docker-bluesky/tasks/main.yml                  | 4 ++--
 roles/docker-bluesky/templates/docker-compose.yml.j2 | 4 ++--
 roles/docker-bluesky/templates/env.j2                | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/group_vars/all/15_about.yml b/group_vars/all/15_about.yml
index 45c62335..250bd935 100644
--- a/group_vars/all/15_about.yml
+++ b/group_vars/all/15_about.yml
@@ -16,7 +16,7 @@ defaults_service_provider:
     logo:           "{{applications.assets_server.url}}/img/logo.png"
     favicon:        "{{applications.assets_server.url}}/img/favicon.ico"
   contact:
-    bluesky: "{{ '@' ~ users.administrator.username ~ '.' ~ domains.[application_id]['api'] if 'bluesky' in group_names else '' }}"
+    bluesky: "{{ '@' ~ users.administrator.username ~ '.' ~ domains.[application_id].api if 'bluesky' in group_names else '' }}"
     email: "contact@{{ primary_domain }}"
     mastodon: "{{ '@' ~ users.administrator.username ~ '@' ~ domains.mastodon if 'mastodon' in group_names else '' }}"
     matrix: "{{ '@' ~ users.administrator.username ~ ':' ~ domains.synapse if 'matrix' in group_names else '' }}"
diff --git a/roles/docker-bluesky/tasks/main.yml b/roles/docker-bluesky/tasks/main.yml
index c465bb87..28243a36 100644
--- a/roles/docker-bluesky/tasks/main.yml
+++ b/roles/docker-bluesky/tasks/main.yml
@@ -10,8 +10,8 @@
     domain: "{{ item.domain }}"
     http_port: "{{ item.http_port }}"
   loop:
-    - { domain: domains.[application_id]['api'], http_port: ports.localhost.http.bluesky_api }
-    - { domain: domains.[application_id]['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
diff --git a/roles/docker-bluesky/templates/docker-compose.yml.j2 b/roles/docker-bluesky/templates/docker-compose.yml.j2
index cb41b3ca..4bde76aa 100644
--- a/roles/docker-bluesky/templates/docker-compose.yml.j2
+++ b/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.[application_id]['api']}}" # URL des PDS
-        REACT_APP_API_URL: "{{ web_protocol }}://{{domains.[application_id]['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:
diff --git a/roles/docker-bluesky/templates/env.j2 b/roles/docker-bluesky/templates/env.j2
index 187443b1..7a9ff9d2 100644
--- a/roles/docker-bluesky/templates/env.j2
+++ b/roles/docker-bluesky/templates/env.j2
@@ -1,6 +1,6 @@
-PDS_HOSTNAME="{{domains.[application_id]['api']}}"
+PDS_HOSTNAME="{{domains.[application_id].api}}"
 PDS_ADMIN_EMAIL="{{applications.bluesky.users.administrator.email}}"
-PDS_SERVICE_DID="did:web:{{domains.[application_id]['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.[application_id]['web']}}
-PDS_BSKY_APP_VIEW_DID=did:web:{{domains.[application_id]['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