diff --git a/roles/web-app-bluesky/tasks/02_social_app.yml b/roles/web-app-bluesky/tasks/02_social_app.yml index f68c21e9..d64081ea 100644 --- a/roles/web-app-bluesky/tasks/02_social_app.yml +++ b/roles/web-app-bluesky/tasks/02_social_app.yml @@ -10,12 +10,12 @@ - name: Force BAPP_CONFIG_URL to same-origin /config ansible.builtin.replace: - path: "{{ BLUESKY_SOCIAL_APP_DIR }}/src/state/geolocation.tsx" + path: "{{ BLUESKY_GEOLOCATION_PATH }}" regexp: '^\s*const\s+BAPP_CONFIG_URL\s*=\s*.*$' replace: "const BAPP_CONFIG_URL = '/config'" - name: Force IPCC_URL to same-origin /ipcc ansible.builtin.replace: - path: "{{ BLUESKY_SOCIAL_APP_DIR }}/src/state/geolocation.tsx" + path: "{{ BLUESKY_GEOLOCATION_PATH }}" regexp: '^\s*const\s+IPCC_URL\s*=\s*.*$' replace: "const IPCC_URL = '/ipcc'" diff --git a/roles/web-app-bluesky/vars/main.yml b/roles/web-app-bluesky/vars/main.yml index bce0943f..0500aab8 100644 --- a/roles/web-app-bluesky/vars/main.yml +++ b/roles/web-app-bluesky/vars/main.yml @@ -4,7 +4,8 @@ application_id: "web-app-bluesky" ## Bluesky ## Social App -BLUESKY_SOCIAL_APP_DIR: "{{ docker_compose.directories.services }}/social-app" +BLUESKY_SOCIAL_APP_DIR: "{{ [ docker_compose.directories.services, 'social-app' ] | path_join }}" +BLUESKY_GEOLOCATION_PATH: "{{ [ BLUESKY_SOCIAL_APP_DIR,'src/state/geolocation/index.tsx' ] | path_join }}" # This should be removed when the following issue is closed: # https://github.com/bluesky-social/pds/issues/52