diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..aebf115 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,49 @@ +--- +kind: pipeline +name: deploy to swarm-test.autonomic.zone +steps: + - name: deployment + image: git.coopcloud.tech/coop-cloud/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 + 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 +--- +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 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 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: 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 3a13c0d..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 @@ -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: