From 2ffaadfacae1f4c222da9c3d1ef5c010bfabc918 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 21 Jul 2025 11:10:06 +0200 Subject: [PATCH] Changed bluesky to web-app-bluesky --- group_vars/all/09_ports.yml | 4 ++-- group_vars/all/10_networks.yml | 2 +- group_vars/all/15_about.yml | 6 +++--- roles/web-app-bluesky/tasks/main.yml | 4 ++-- roles/web-app-bluesky/templates/docker-compose.yml.j2 | 4 ++-- roles/web-app-bluesky/templates/env.j2 | 6 +++--- roles/web-app-bluesky/vars/main.yml | 5 ++++- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/group_vars/all/09_ports.yml b/group_vars/all/09_ports.yml index ac50e054..5ec8b9d7 100644 --- a/group_vars/all/09_ports.yml +++ b/group_vars/all/09_ports.yml @@ -51,8 +51,8 @@ ports: web-app-taiga: 8027 web-app-friendica: 8028 web-app-port-ui: 8029 - bluesky_api: 8030 - bluesky_web: 8031 + web-app-bluesky_api: 8030 + web-app-bluesky_web: 8031 web-app-keycloak: 8032 web-app-lam: 8033 web-app-phpmyadmin: 8034 diff --git a/group_vars/all/10_networks.yml b/group_vars/all/10_networks.yml index edc94bb3..a43cc297 100644 --- a/group_vars/all/10_networks.yml +++ b/group_vars/all/10_networks.yml @@ -16,7 +16,7 @@ defaults_networks: subnet: 192.168.101.32/28 web-app-mobilizon: subnet: 192.168.101.48/28 - bluesky: + web-app-bluesky: subnet: 192.168.101.64/28 web-app-friendica: subnet: 192.168.101.80/28 diff --git a/group_vars/all/15_about.yml b/group_vars/all/15_about.yml index 820f640f..ef46a9f2 100644 --- a/group_vars/all/15_about.yml +++ b/group_vars/all/15_about.yml @@ -16,9 +16,9 @@ defaults_service_provider: logo: "{{ applications['web-svc-asset'].url ~ '/img/logo.png' }}" favicon: "{{ applications['web-svc-asset'].url ~ '/img/favicon.ico' }}" contact: - bluesky: >- - {{ ('@' ~ users.contact.username ~ '.' ~ domains.bluesky.api) - if 'bluesky' in group_names else '' }} + web-app-bluesky: >- + {{ ('@' ~ users.contact.username ~ '.' ~ domains['web-app-bluesky'].api) + if 'web-app-bluesky' in group_names else '' }} email: "{{ users.contact.username ~ '@' ~ primary_domain if 'web-app-mailu' in group_names else '' }}" mastodon: "{{ '@' ~ users.contact.username ~ '@' ~ domains | get_domain('web-app-mastodon') if 'web-app-mastodon' in group_names else '' }}" matrix: "{{ '@' ~ users.contact.username ~ ':' ~ domains['web-app-matrix'].synapse if 'web-app-matrix' in group_names else '' }}" diff --git a/roles/web-app-bluesky/tasks/main.yml b/roles/web-app-bluesky/tasks/main.yml index f809df1c..876ae1e3 100644 --- a/roles/web-app-bluesky/tasks/main.yml +++ b/roles/web-app-bluesky/tasks/main.yml @@ -9,8 +9,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['web-app-bluesky_api']}}" } + - { domain: "{{domains[application_id].web}}", http_port: "{{ports.localhost.http['web-app-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/web-app-bluesky/templates/docker-compose.yml.j2 b/roles/web-app-bluesky/templates/docker-compose.yml.j2 index 0b21a40e..6a455b4b 100644 --- a/roles/web-app-bluesky/templates/docker-compose.yml.j2 +++ b/roles/web-app-bluesky/templates/docker-compose.yml.j2 @@ -9,7 +9,7 @@ - pds_data:/opt/pds - {{pdsadmin_file_path}}:/usr/local/bin/pdsadmin:ro ports: - - "127.0.0.1:{{ports.localhost.http.bluesky_api}}:{{ container_port }}" + - "127.0.0.1:{{ports.localhost.http['web-app-bluesky_api']}}:{{ container_port }}" {% include 'roles/docker-container/templates/healthcheck/wget.yml.j2' %} {% include 'roles/docker-container/templates/networks.yml.j2' %} @@ -27,7 +27,7 @@ REACT_APP_SITE_NAME: "{{primary_domain | upper}} - Bluesky" REACT_APP_SITE_DESCRIPTION: "Decentral Social " ports: - - "127.0.0.1:{{ports.localhost.http.bluesky_web}}:8100" + - "127.0.0.1:{{ports.localhost.http['web-app-bluesky_web']}}:8100" healthcheck: test: ["CMD", "sh", "-c", "for pid in $(ls /proc | grep -E '^[0-9]+$'); do if cat /proc/$pid/cmdline 2>/dev/null | grep -q 'bskywebserve'; then exit 0; fi; done; exit 1"] interval: 30s diff --git a/roles/web-app-bluesky/templates/env.j2 b/roles/web-app-bluesky/templates/env.j2 index 76d2757d..06d36044 100644 --- a/roles/web-app-bluesky/templates/env.j2 +++ b/roles/web-app-bluesky/templates/env.j2 @@ -4,9 +4,9 @@ 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}}" -PDS_JWT_SECRET="{{applications.bluesky.credentials.jwt_secret}}" -PDS_ADMIN_PASSWORD="{{applications.bluesky.credentials.admin_password}}" -PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX="{{applications.bluesky.credentials.plc_rotation_key_k256_private_key_hex}}" +PDS_JWT_SECRET="{{ bluesky_jwt_secret }}" +PDS_ADMIN_PASSWORD="{{bluesky_admin_password}}" +PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX="{{ bluesky_rotation_key }}" PDS_CRAWLERS=https://bsky.network PDS_EMAIL_SMTP_URL=smtps://{{ users['no-reply'].email }}:{{ users['no-reply'].mailu_token }}@{{system_email.host}}:{{system_email.port}}/ PDS_EMAIL_FROM_ADDRESS={{ users['no-reply'].email }} diff --git a/roles/web-app-bluesky/vars/main.yml b/roles/web-app-bluesky/vars/main.yml index 011d95ab..8fbaa171 100644 --- a/roles/web-app-bluesky/vars/main.yml +++ b/roles/web-app-bluesky/vars/main.yml @@ -1,4 +1,4 @@ -application_id: "bluesky" +application_id: "web-app-bluesky" social_app_path: "{{ docker_compose.directories.services }}/social-app" # This should be removed when the following issue is closed: @@ -6,3 +6,6 @@ social_app_path: "{{ docker_compose.directories.services }}/social- pdsadmin_folder_path: "{{ docker_compose.directories.volumes }}/pdsadmin" pdsadmin_file_path: "{{pdsadmin_folder_path}}/pdsadmin" pdsadmin_temporary_tar_path: "/tmp/pdsadmin.tar.gz" +bluesky_jwt_secret: "{{ applications | get_app_conf(application_id, 'credentials.jwt_secret') }}" +bluesky_admin_password: "{{ applications | get_app_conf(application_id, 'credentials.admin_password') }}" +bluesky_rotation_key: "{{ applications | get_app_conf(application_id, 'credentials.plc_rotation_key_k256_private_key_hex') }}" \ No newline at end of file