From d5c70f5567bcb3395e185b5da1bfbd04551869b6 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Thu, 19 Jan 2023 16:02:28 -0800 Subject: [PATCH 1/7] Update abra syntax in examples (finally) [mass update] --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b2a08fd..b4b6dfb 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ 1. Set up Docker Swarm and [`abra`](https://docs.coopcloud.tech/abra/) 2. Deploy [`coop-cloud/traefik`](https://git.coopcloud.tech/coop-cloud/traefik) 3. `abra app new matrix-synapse --secrets` (optionally with `--pass` if you'd like to save secrets in `pass`) -4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box -5. `abra app YOURAPPDOMAIN deploy` -6. Create an initial user: `abra app YOURAPPDOMAIN run app register_new_matrix_user -c /data/homeserver.yaml http://localhost:8008` +4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box +5. `abra app deploy YOURAPPDOMAIN` +6. Create an initial user: `abra app run YOURAPPDOMAIN app register_new_matrix_user -c /data/homeserver.yaml http://localhost:8008` ## Tips & Tricks From ec22040bd3cc7879b2bafcc5efcdf6b62e570934 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 10:45:03 -0800 Subject: [PATCH 2/7] Add CI and catalogue generation [mass update] --- .drone.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..b2475b9 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,38 @@ +--- +kind: pipeline +name: deploy to swarm-test.autonomic.zone +steps: + - name: deployment + image: decentral1se/stack-ssh-deploy:latest + settings: + host: swarm-test.autonomic.zone + stack: matrix-synapse + generate_secrets: true + purge: true + deploy_key: + from_secret: drone_ssh_swarm_test + networks: + - proxy + environment: + DOMAIN: matrix-synapse.swarm-test.autonomic.zone + STACK_NAME: matrix-synapse + LETS_ENCRYPT_ENV: production +trigger: + branch: + - main +--- +kind: pipeline +name: generate recipe catalogue +steps: + - name: release a new version + image: plugins/downstream + settings: + server: https://build.coopcloud.tech + token: + from_secret: drone_abra-bot_token + fork: true + repositories: + - coop-cloud/auto-recipes-catalogue-json + +trigger: + event: tag From 05e9ee073282a0586f71428b7e7b91805ff8ede2 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 21:32:06 -0800 Subject: [PATCH 3/7] Add drone configs / secrets [mass update] --- .drone.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.drone.yml b/.drone.yml index b2475b9..a472b4b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,17 @@ steps: DOMAIN: matrix-synapse.swarm-test.autonomic.zone STACK_NAME: matrix-synapse LETS_ENCRYPT_ENV: production + DISCORD_BRIDGE_YAML_VERSION: v1 + ENTRYPOINT_CONF_VERSION: v1 + HOMESERVER_YAML_VERSION: v17 + LOG_CONFIG_VERSION: v1 + SHARED_SECRET_AUTH_VERSION: v1 + SIGNAL_BRIDGE_YAML_VERSION: v1 + TELEGRAM_BRIDGE_YAML_VERSION: v1 + SECRET_DB_PASSWORD_VERSION: v1 + SECRET_FORM_SECRET_VERSION: v1 + SECRET_MACAROON_SECRET_KEY_VERSION: v1 + SECRET_REGISTRATION_SHARED_SECRET_VERSION: v1 trigger: branch: - main From 703b8d91d2d88f4223717319818df3ff72153a69 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sat, 21 Jan 2023 11:49:56 -0800 Subject: [PATCH 4/7] Switch to self-hosted stack-ssh-deploy image [mass update] --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index a472b4b..aebf115 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ kind: pipeline name: deploy to swarm-test.autonomic.zone steps: - name: deployment - image: decentral1se/stack-ssh-deploy:latest + image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest settings: host: swarm-test.autonomic.zone stack: matrix-synapse From 5a72540db2aff873e9526823116a8bc3364e06d7 Mon Sep 17 00:00:00 2001 From: josef Date: Thu, 2 Feb 2023 18:12:12 +0000 Subject: [PATCH 5/7] homserver -> homeserver --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index 3a13c0d..580dcf9 100644 --- a/compose.yml +++ b/compose.yml @@ -102,7 +102,7 @@ configs: file: entrypoint.sh.tmpl template_driver: golang homeserver_yaml: - name: ${STACK_NAME}_homserver_yaml_${HOMESERVER_YAML_VERSION} + name: ${STACK_NAME}_homeserver_yaml_${HOMESERVER_YAML_VERSION} file: homeserver.yaml.tmpl template_driver: golang log_config: From beeb1e47b174a4af9f657f5ab916a6d659e55071 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 13 Feb 2023 09:26:27 +0100 Subject: [PATCH 6/7] chore: publish 3.1.0+v1.76.0 release --- compose.signal.yml | 2 +- compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.signal.yml b/compose.signal.yml index 94d8a28..7740d36 100644 --- a/compose.signal.yml +++ b/compose.signal.yml @@ -10,7 +10,7 @@ services: - signal-data:/signal-data signald: - image: docker.io/signald/signald:0.23.0-non-root + image: docker.io/signald/signald:0.23.2-non-root networks: - internal volumes: diff --git a/compose.yml b/compose.yml index 580dcf9..9a651f7 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "matrixdotorg/synapse:v1.74.0" + image: "matrixdotorg/synapse:v1.76.0" volumes: - "data:/data" depends_on: @@ -61,7 +61,7 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "coop-cloud.${STACK_NAME}.version=3.0.0+v1.74.0" + - "coop-cloud.${STACK_NAME}.version=3.1.0+v1.76.0" db: image: postgres:13-alpine From f43a47d4c8c844fdaad6a6e83492bed1ccf475aa Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 14 Feb 2023 10:00:28 +0100 Subject: [PATCH 7/7] fix: use new mount for shared secret auth See https://github.com/devture/matrix-synapse-shared-secret-auth/commit/b3dfa110976206173db0efe46a3924a4445891c5 --- compose.shared_secret_auth.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.shared_secret_auth.yml b/compose.shared_secret_auth.yml index fba5ade..784b452 100644 --- a/compose.shared_secret_auth.yml +++ b/compose.shared_secret_auth.yml @@ -9,7 +9,7 @@ services: - shared_secret_auth configs: - source: shared_secret_auth - target: /usr/local/lib/python3.9/site-packages/shared_secret_authenticator.py + target: /usr/local/lib/python3.11/site-packages/shared_secret_authenticator.py configs: shared_secret_auth: