Refactored bluesky

group_vars/all/07_applications.yml

@@ -36,6 +36,9 @@ defaults_applications:
     administrator_email:    "{{administrator_email}}"
     pds:
       version:              "latest"
+      #jwt_secret:                            # Needs to be defined in inventory file  
+      #plc_rotation_key_k256_private_key_hex: # Needs to be defined in inventory file  
+      #admin_password:                        # Needs to be defined in inventory file  
 
   ## Friendica
   friendica:

roles/docker-baserow/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-bluesky/README.md

@@ -4,16 +4,16 @@
 ## Setup 
 ### Set variables
 
-#### bluesky_pds_jwt_secret
+#### applications.bluesky.pds.jwt_secret
 ```bash
 openssl rand -base64 64 | tr -d '\n'
 ```
 for 
 
-#### bluesky_pds_plc_rotation_key_k256_private_key_hex
+#### applications.bluesky.pds.plc_rotation_key_k256_private_key_hex
 openssl rand -hex 32
 
-#### bluesky_pds_admin_password
+#### applications.bluesky.pds.admin_password
 openssl rand -base64 16
 
 ### Configure DNS
@@ -58,4 +58,4 @@ Initial setup keine top level domain
 - https://github.com/bluesky-social/pds/issues/52
 - https://github.com/lhaig/pdsadmin
 - https://github.com/bluesky-social/pds/issues/147
-- 
+- https://docs.bsky.app/docs/advanced-guides/oauth-client

roles/docker-bluesky/tasks/main.yml

@@ -50,8 +50,5 @@
     version: "main"
   notify: docker compose project build and setup 
 
-- name: add docker-compose.yml
-  template: 
-    src:  docker-compose.yml.j2
-    dest: "{{docker_compose.directories.instance}}docker-compose.yml"
-  notify: docker compose project build and setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-bluesky/templates/docker-compose.yml.j2

@@ -1,33 +1,10 @@
 services:
   pds:
     image: "ghcr.io/bluesky-social/pds:{{applications.bluesky.pds.version}}"
-    restart: {{docker_restart_policy}}
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     volumes:
         - pds_data:/pds
         - {{pdsadmin_file_path}}:/usr/local/bin/pdsadmin:ro
-    environment:
-      # Geben Sie hier Ihre Domain und Konfigurationsdetails an
-      PDS_HOSTNAME: "{{domains.api}}"
-      PDS_ADMIN_EMAIL: "{{applications.bluesky.administrator_email}}"
-      PDS_SERVICE_DID: "did:web:{{domain_api}}"
-      # See https://mattdyson.org/blog/2024/11/self-hosting-bluesky-pds/
-      PDS_SERVICE_HANDLE_DOMAINS: ".{{primary_domain}}"
-      PDS_JWT_SECRET: "{{bluesky_pds_jwt_secret}}"
-      PDS_ADMIN_PASSWORD: "{{bluesky_pds_admin_password}}"
-      PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX: "{{bluesky_pds_plc_rotation_key_k256_private_key_hex}}"
-      PDS_CRAWLERS: https://bsky.network
-      PDS_EMAIL_SMTP_URL: smtps://{{system_email.username}}:{{system_email.password}}@{{system_email.host}}:{{system_email.port}}/
-      PDS_EMAIL_FROM_ADDRESS: {{system_email.from}}
-      LOG_ENABLED: true
-      PDS_BLOBSTORE_DISK_LOCATION: /opt/pds/blocks
-      # -- DEFAULT VALUES ---
-      # PDS_DATA_DIRECTORY: /opt/pds
-      # PDS_BLOB_UPLOAD_LIMIT: 52428800
-      # PDS_DID_PLC_URL=https://plc.directory
-      # PDS_BSKY_APP_VIEW_URL=https://api.bsky.app
-      # PDS_BSKY_APP_VIEW_DID=did:web:api.bsky.app
-      # PDS_REPORT_SERVICE_URL=https://mod.bsky.app
-      # PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac
     ports:
       - "127.0.0.1:{{http_port_api}}:3000"
     healthcheck:
@@ -49,17 +26,14 @@ services:
         REACT_APP_API_URL: "http://{{domain_api}}" # API-URL des PDS
         REACT_APP_SITE_NAME: "{{primary_domain | upper}} - Bluesky"
         REACT_APP_SITE_DESCRIPTION: "Decentral Social "
-    restart: {{docker_restart_policy}}
     ports:
       - "127.0.0.1:{{http_port_web}}:8100"
-    # Start already parallel to pds
-    #depends_on:
-    #  - None
     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
       timeout: 10s
       retries: 3
+{% include 'templates/docker/container/networks.yml.j2' %}
 
 {% include 'templates/docker/compose/volumes.yml.j2' %}
   pds_data:

roles/docker-bluesky/templates/env.j2

@@ -0,0 +1,22 @@
+PDS_HOSTNAME="{{domains.bluesky_api}}"
+PDS_ADMIN_EMAIL="{{applications.bluesky.administrator_email}}"
+PDS_SERVICE_DID="did:web:{{domains.bluesky_api}}"
+
+# See https://mattdyson.org/blog/2024/11/self-hosting-bluesky-pds/
+PDS_SERVICE_HANDLE_DOMAINS=".{{primary_domain}}"
+PDS_JWT_SECRET="{{applications.bluesky.pds.jwt_secret}}"
+PDS_ADMIN_PASSWORD="{{applications.bluesky.pds.admin_password}}"
+PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX="{{applications.bluesky.pds.plc_rotation_key_k256_private_key_hex}}"
+PDS_CRAWLERS=https://bsky.network
+PDS_EMAIL_SMTP_URL=smtps://{{system_email.username}}:{{system_email.password}}@{{system_email.host}}:{{system_email.port}}/
+PDS_EMAIL_FROM_ADDRESS={{system_email.from}}
+LOG_ENABLED=true
+PDS_BLOBSTORE_DISK_LOCATION=/opt/pds/blocks
+# -- DEFAULT VALUES ---
+# PDS_DATA_DIRECTORY: /opt/pds
+# PDS_BLOB_UPLOAD_LIMIT: 52428800
+# PDS_DID_PLC_URL=https://plc.directory
+# PDS_BSKY_APP_VIEW_URL=https://api.bsky.app
+# PDS_BSKY_APP_VIEW_DID=did:web:api.bsky.app
+# PDS_REPORT_SERVICE_URL=https://mod.bsky.app
+# PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac

roles/docker-bluesky/vars/main.yml

@@ -1,8 +1,8 @@
 application_id:               "bluesky"
-social_app_path:              "{{ docker_compose.directories.instance }}/social-app"
+social_app_path:              "{{ docker_compose.directories.services }}/social-app"
 
 # This should be removed when the following issue is closed:
 # https://github.com/bluesky-social/pds/issues/52
-pdsadmin_folder_path:         "{{ docker_compose.directories.instance }}/pdsadmin"
+pdsadmin_folder_path:         "{{ docker_compose.directories.volumes }}/pdsadmin"
 pdsadmin_file_path:           "{{pdsadmin_folder_path}}/pdsadmin"
 pdsadmin_temporary_tar_path:  "/tmp/pdsadmin.tar.gz"

roles/docker-friendica/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-funkwhale/tasks/main.yml

@@ -6,19 +6,7 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
 
 

roles/docker-gitea/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-gitlab/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-joomla/tasks/main.yml

@@ -9,16 +9,5 @@
   loop_control:
     loop_var: domain
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-keycloak/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-ldap/tasks/main.yml

@@ -24,19 +24,8 @@
     name: central_ldap
     state: present
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
 
 - name: "create {{docker_compose.directories.env}}phpldapadmin.env"
   template: 

roles/docker-listmonk/tasks/main.yml

@@ -15,19 +15,8 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
 
 - name: add config.toml
   template: 

roles/docker-mailu/tasks/main.yml

@@ -12,19 +12,8 @@
   include_role:
     name: nginx-docker-cert-deploy
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
 
 - name: flush docker service
   meta: flush_handlers

roles/docker-mastodon/tasks/main.yml

@@ -9,19 +9,8 @@
   loop_control:
     loop_var: domain
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
 
 - name: flush docker service
   meta: flush_handlers

roles/docker-matomo/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-moodle/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-nextcloud/tasks/main.yml

@@ -18,19 +18,8 @@
     dest: "{{docker_compose.directories.volumes}}nginx.conf"
   notify: docker compose project setup
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
 
 - name: Include OIDC-specific tasks if OIDC client is active
   include_tasks: oidc_tasks.yml

roles/docker-openproject/tasks/main.yml

@@ -50,16 +50,5 @@
     state: directory
     mode: 0755
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-peertube/tasks/main.yml

@@ -9,16 +9,5 @@
   loop_control:
     loop_var: domain
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-phpmyadmin/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-pixelfed/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-snipe_it/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-taiga/tasks/main.yml

@@ -20,16 +20,5 @@
     dest:	"{{docker_compose_init}}"
   notify: docker compose project setup
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

roles/docker-wordpress/tasks/main.yml

@@ -27,17 +27,6 @@
     - docker compose project setup
     - rebuild wordpress container
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml
   

roles/docker-yourls/tasks/main.yml

@@ -6,16 +6,5 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose.files.docker_compose}}"
-  template:
-    src:	"docker-compose.yml.j2"
-    dest:	"{{docker_compose.files.docker_compose}}"
-  notify: docker compose project setup
-
-- name: "create {{docker_compose.files.env}}"
-  template: 
-    src:  "env.j2" 
-    dest: "{{docker_compose.files.env}}"
-    mode: '770'
-    force: yes
-  notify: docker compose project setup
+- name: "copy docker-compose.yml and env file"
+  include_tasks: copy-docker-compose-and-env.yml

tasks/copy-docker-compose-and-env.yml

@@ -0,0 +1,13 @@
+- name: "create {{docker_compose.files.docker_compose}}"
+  template:
+    src:	"docker-compose.yml.j2"
+    dest:	"{{docker_compose.files.docker_compose}}"
+  notify: docker compose project setup
+
+- name: "create {{docker_compose.files.env}}"
+  template: 
+    src:  "env.j2" 
+    dest: "{{docker_compose.files.env}}"
+    mode: '770'
+    force: yes
+  notify: docker compose project setup