From 9e402c863fbe4d32f001a7d542e331f07b666142 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 25 Sep 2025 13:29:45 +0200 Subject: [PATCH] Optimized Bleusky API redirect domain --- roles/web-app-bluesky/tasks/03_dns.yml | 10 +++++----- roles/web-app-bluesky/tasks/main.yml | 6 +++--- roles/web-app-bluesky/vars/main.yml | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/roles/web-app-bluesky/tasks/03_dns.yml b/roles/web-app-bluesky/tasks/03_dns.yml index 544d014e..a8dcd2bf 100644 --- a/roles/web-app-bluesky/tasks/03_dns.yml +++ b/roles/web-app-bluesky/tasks/03_dns.yml @@ -60,13 +60,13 @@ ] + ( - (BLUESKY_VIEW_DOMAIN != 'api.bsky.app') + (BLUESKY_VIEW_DOMAIN_FINAL != 'api.bsky.app') | ternary([ { 'type': 'A', 'solo': True, - 'zone': (BLUESKY_VIEW_DOMAIN | to_zone), - 'name': BLUESKY_VIEW_DOMAIN, + 'zone': (BLUESKY_VIEW_DOMAIN_FINAL | to_zone), + 'name': BLUESKY_VIEW_DOMAIN_FINAL, 'content': networks.internet.ip4, 'proxied': False, 'state': ( @@ -77,8 +77,8 @@ { 'type': 'AAAA', 'solo': True, - 'zone': (BLUESKY_VIEW_DOMAIN | to_zone), - 'name': BLUESKY_VIEW_DOMAIN, + 'zone': (BLUESKY_VIEW_DOMAIN_FINAL | to_zone), + 'name': BLUESKY_VIEW_DOMAIN_FINAL, 'content': (networks.internet.ip6 | default('')), 'proxied': False, 'state': ( diff --git a/roles/web-app-bluesky/tasks/main.yml b/roles/web-app-bluesky/tasks/main.yml index 1788b75f..f8f72aeb 100644 --- a/roles/web-app-bluesky/tasks/main.yml +++ b/roles/web-app-bluesky/tasks/main.yml @@ -20,11 +20,11 @@ proxy_extra_configuration: "{{ BLUESKY_FRONT_PROXY_CONTENT }}" when: BLUESKY_WEB_ENABLED | bool -- name: "Include front proxy for {{ BLUESKY_VIEW_DOMAIN }}:{{ BLUESKY_VIEW_PORT }}" +- name: "Include front proxy for {{ BLUESKY_VIEW_DOMAIN_FINAL }}:{{ BLUESKY_VIEW_PORT }}" include_role: name: sys-stk-front-proxy vars: - domain: "{{ BLUESKY_VIEW_DOMAIN }}" + domain: "{{ BLUESKY_VIEW_DOMAIN_FINAL }}" http_port: "{{ BLUESKY_VIEW_PORT }}" when: BLUESKY_VIEW_ENABLED | bool @@ -44,7 +44,7 @@ BLUESKY_REDIRECT_DOMAIN_MAPPINGS: >- {{ ( (BLUESKY_WEB_ENABLED | bool) | ternary([], [ {'source': BLUESKY_WEB_DOMAIN, 'target': BLUESKY_API_DOMAIN } ]) ) - + ( (BLUESKY_VIEW_ENABLED | bool) | ternary([], [ {'source': BLUESKY_VIEW_DOMAIN, 'target': BLUESKY_API_DOMAIN } ]) ) + + ( (BLUESKY_VIEW_ENABLED | bool) | ternary([], [ {'source': BLUESKY_VIEW_DOMAIN_LOCAL, 'target': BLUESKY_API_DOMAIN } ]) ) }} - name: "Redirect deactivated BlueSky Services to {{ BLUESKY_API_DOMAIN }}" diff --git a/roles/web-app-bluesky/vars/main.yml b/roles/web-app-bluesky/vars/main.yml index 44d3452a..bb5c9332 100644 --- a/roles/web-app-bluesky/vars/main.yml +++ b/roles/web-app-bluesky/vars/main.yml @@ -27,9 +27,10 @@ BLUESKY_WEB_PORT: "{{ ports.localhost.http['web-app-bluesky_web'] ## View BLUESKY_VIEW_ENABLED: "{{ applications | get_app_conf(application_id, 'docker.services.view.enabled') }}" -BLUESKY_VIEW_DOMAIN: "{{ domains[application_id].view if BLUESKY_VIEW_ENABLED else 'api.bsky.app' }}" -BLUESKY_VIEW_URL: "{{ WEB_PROTOCOL }}://{{ BLUESKY_VIEW_DOMAIN }}" -BLUESKY_VIEW_DID: "did:web:{{ BLUESKY_VIEW_DOMAIN }}" +BLUESKY_VIEW_DOMAIN_LOCAL: "{{ domains[application_id].view }}" +BLUESKY_VIEW_DOMAIN_FINAL: "{{ BLUESKY_VIEW_DOMAIN_LOCAL if BLUESKY_VIEW_ENABLED else 'api.bsky.app' }}" +BLUESKY_VIEW_URL: "{{ WEB_PROTOCOL }}://{{ BLUESKY_VIEW_DOMAIN_FINAL }}" +BLUESKY_VIEW_DID: "did:web:{{ BLUESKY_VIEW_DOMAIN_FINAL }}" BLUESKY_VIEW_PORT: "{{ ports.localhost.http['web-app-bluesky_view'] }}" ## Server