kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-02-23 12:51:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored bluesky variables

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-02-07 00:12:05 +01:00
parent f0760d3969
commit 22309acfff
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbook.servers.yml
View File

@ -196,11 +196,6 @@
become: true become: true
roles: roles:
- role: docker-bluesky - role: docker-bluesky
vars:
domain_api: "{{domains.bluesky_api}}"
domain_web: "{{domains.bluesky_web}}"
http_port_api: 8030
http_port_web: 8031
- name: setup keycloak - name: setup keycloak
hosts: keycloak hosts: keycloak

8
roles/docker-bluesky/tasks/main.yml
View File

@ -6,14 +6,14 @@
- name: "Include tasks for API domain" - name: "Include tasks for API domain"
include_tasks: nginx-docker-proxy-domain.yml include_tasks: nginx-docker-proxy-domain.yml
vars: vars:
domain: "{{ domain_api }}" domain: "{{ domains.bluesky_api }}"
http_port: "{{ http_port_api }}" http_port: "{{ ports.localhost.http_ports.bluesky_api }}"
- name: "Include tasks for Web domain" - name: "Include tasks for Web domain"
include_tasks: nginx-docker-proxy-domain.yml include_tasks: nginx-docker-proxy-domain.yml
vars: vars:
domain: "{{ domain_web }}" domain: "{{ domains.bluesky_web }}"
http_port: "{{ http_port_web }}" http_port: "{{ ports.localhost.http_ports.bluesky_web }}"
# The following lines should be removed when the following issue is closed: # The following lines should be removed when the following issue is closed:
# https://github.com/bluesky-social/pds/issues/52 # https://github.com/bluesky-social/pds/issues/52

8
roles/docker-bluesky/templates/docker-compose.yml.j2
View File

@ -6,7 +6,7 @@ services:
- pds_data:/pds - pds_data:/pds
- {{pdsadmin_file_path}}:/usr/local/bin/pdsadmin:ro - {{pdsadmin_file_path}}:/usr/local/bin/pdsadmin:ro
ports: ports:
- "127.0.0.1:{{http_port_api}}:3000" - "127.0.0.1:{{ports.localhost.http_ports.bluesky_api}}:3000"
healthcheck: healthcheck:
test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"] test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"]
interval: 1m interval: 1m
@ -22,12 +22,12 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
# It doesn't compile yet with this parameters. @todo Fix it # It doesn't compile yet with this parameters. @todo Fix it
args: args:
REACT_APP_PDS_URL: "http://{{domain_api}}" # URL des PDS REACT_APP_PDS_URL: "http://{{domains.bluesky_api}}" # URL des PDS
REACT_APP_API_URL: "http://{{domain_api}}" # API-URL des PDS REACT_APP_API_URL: "http://{{domains.bluesky_api}}" # API-URL des PDS
REACT_APP_SITE_NAME: "{{primary_domain | upper}} - Bluesky" REACT_APP_SITE_NAME: "{{primary_domain | upper}} - Bluesky"
REACT_APP_SITE_DESCRIPTION: "Decentral Social " REACT_APP_SITE_DESCRIPTION: "Decentral Social "
ports: ports:
- "127.0.0.1:{{http_port_web}}:8100" - "127.0.0.1:{{ports.localhost.http_ports.bluesky_web}}:8100"
healthcheck: 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"] 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 interval: 30s