chore: publish 3.2.0+v1.77.0 release

.env.sample

@@ -1,21 +1,18 @@
 TYPE=matrix-synapse
-DOMAIN=matrix-synapse.example.com
-#TIMEOUT=300
-#ENABLE_AUTO_UPDATE=true
+DOMAIN=matrix.example.com
 LETS_ENCRYPT_ENV=production
 COMPOSE_FILE="compose.yml"
-# POST_DEPLOY_CMDS="db set_admin"
 
 ## Admin details
 
-ADMIN_EMAIL=admin@example.com
+SYNAPSE_ADMIN_EMAIL=admin@example.com
 
 ## Secrets
 
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_FORM_SECRET_VERSION=v1
-SECRET_MACAROON_VERSION=v1
-SECRET_REGISTRATION_VERSION=v1
+SECRET_MACAROON_SECRET_KEY_VERSION=v1
+SECRET_REGISTRATION_SHARED_SECRET_VERSION=v1
 
 ## Federation
 
@@ -24,8 +21,6 @@ SECRET_REGISTRATION_VERSION=v1
 # Set "true" to enable federation endpoint on $DOMAIN/.well-known/matrix/server
 SERVE_SERVER_WELLKNOWN=false
 
-ALLOW_PUBLIC_ROOMS_FEDERATION=false
-
 ## Registration
 
 ENABLE_REGISTRATION=false
@@ -53,9 +48,6 @@ ENCRYPTED_BY_DEFAULT=all
 #ENABLE_ALLOWLIST=1
 #FEDERATION_ALLOWLIST="[]"
 
-# Set these to keyservers you trust - usually the same as your federation allowlist
-#TRUSTED_KEYSERVERS="trusted_key_servers:\n  - server_name: 'example.com'\n  - server_name: 'example2.com'"
-
 ## Retention
 
 ALLOWED_LIFETIME_MAX=4w
@@ -80,16 +72,6 @@ RETENTION_MAX_LIFETIME=4w
 
 ## TURN
 
-#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak3.yml"
-#KEYCLOAK3_ENABLED=1
-#KEYCLOAK3_ID=keycloak3
-#KEYCLOAK3_NAME=
-#KEYCLOAK3_URL=
-#KEYCLOAK3_CLIENT_ID=
-#KEYCLOAK3_CLIENT_DOMAIN=
-#KEYCLOAK3_ALLOW_EXISTING_USERS=false
-#SECRET_KEYCLOAK3_CLIENT_SECRET_VERSION=v1
-
 #COMPOSE_FILE="$COMPOSE_FILE:compose.turn.yml"
 #TURN_ENABLED=1
 #TURN_URIS="[\"turns:coturn.foo.zone?transport=udp\", \"turns:coturn.foo.zone?transport=tcp\"]"
@@ -124,7 +106,6 @@ RETENTION_MAX_LIFETIME=4w
 #ENABLE_ENCRYPTION=true
 #TELEGRAM_APP_ID=
 #TELEGRAM_BRIDGE_PERMISSIONS="{ \"*\": \"relaybot\" }"
-#TELEGRAM_SYNC_CHANNEL_MEMBERS=true
 #SECRET_TELEGRAM_DB_PASSWORD_VERSION=v1
 #SECRET_TELEGRAM_API_HASH_VERSION=v1
 #SECRET_TELEGRAM_BOT_TOKEN_VERSION=v1

README.md

@@ -24,10 +24,6 @@
 
 ## Tips & Tricks
 
-### Set Admin User
-
-`abra app cmd YOURAPPDOMAIN db set_admin <adminuser>`
-
 ### Disabling federation
 
 - Use `DISABLE_FEDERATION=1` to turn off federation listeners

abra.sh

@@ -1,19 +1,7 @@
 export DISCORD_BRIDGE_YAML_VERSION=v2
 export ENTRYPOINT_CONF_VERSION=v1
-export HOMESERVER_YAML_VERSION=v24
+export HOMESERVER_YAML_VERSION=v17
 export LOG_CONFIG_VERSION=v2
 export SHARED_SECRET_AUTH_VERSION=v1
 export SIGNAL_BRIDGE_YAML_VERSION=v4
-export TELEGRAM_BRIDGE_YAML_VERSION=v6
-export NGINX_CONFIG_VERSION=v4
-export WK_SERVER_VERSION=v1
-export WK_CLIENT_VERSION=v1
-
-set_admin () {
-    admin=akadmin
-    if [ -n "$1" ]
-    then
-        admin=$1 
-    fi
-    psql -U synapse -c "UPDATE users SET admin = 1 WHERE name = '@$admin:$DOMAIN'";
-}
+export TELEGRAM_BRIDGE_YAML_VERSION=v5

compose.discord.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  synapse:
+  app:
     environment:
       - APP_SERVICES_ENABLED
       - APP_SERVICE_CONFIGS

compose.keycloak.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  synapse:
+  app:
     secrets:
       - db_password
       - form_secret

compose.keycloak2.yml

@@ -1,19 +0,0 @@
----
-version: "3.8"
-
-services:
-  synapse:
-    secrets:
-      - keycloak2_client_secret
-    environment:
-      - KEYCLOAK2_ALLOW_EXISTING_USERS
-      - KEYCLOAK2_CLIENT_ID
-      - KEYCLOAK2_ENABLED
-      - KEYCLOAK2_ID
-      - KEYCLOAK2_NAME
-      - KEYCLOAK2_URL
-
-secrets:
-  keycloak2_client_secret:
-    external: true
-    name: ${STACK_NAME}_keycloak2_client_secret_${SECRET_KEYCLOAK2_CLIENT_SECRET_VERSION}

compose.keycloak3.yml

@@ -1,19 +0,0 @@
----
-version: "3.8"
-
-services:
-  synapse:
-    secrets:
-      - keycloak3_client_secret
-    environment:
-      - KEYCLOAK3_ALLOW_EXISTING_USERS
-      - KEYCLOAK3_CLIENT_ID
-      - KEYCLOAK3_ENABLED
-      - KEYCLOAK3_ID
-      - KEYCLOAK3_NAME
-      - KEYCLOAK3_URL
-
-secrets:
-  keycloak3_client_secret:
-    external: true
-    name: ${STACK_NAME}_keycloak3_client_secret_${SECRET_KEYCLOAK3_CLIENT_SECRET_VERSION}

compose.shared_secret_auth.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  synapse:
+  app:
     environment:
       - SHARED_SECRET_AUTH_ENABLED
     secrets:

compose.signal.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  synapse:
+  app:
     environment:
       - APP_SERVICES_ENABLED
       - APP_SERVICE_CONFIGS
@@ -17,7 +17,7 @@ services:
       - signald-data:/signald
 
   signalbridge:
-    image: dock.mau.dev/mautrix/signal:v0.4.3
+    image: dock.mau.dev/mautrix/signal:v0.4.2
     depends_on:
       - signaldb
     configs:

compose.smtp.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  synapse:
+  app:
     secrets:
       - db_password
       - form_secret

compose.telegram.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  synapse:
+  app:
     environment:
       - APP_SERVICES_ENABLED
       - APP_SERVICE_CONFIGS
@@ -10,7 +10,7 @@ services:
       - telegram-data:/telegram-data
 
   telegrambridge:
-    image: dock.mau.dev/mautrix/telegram:v0.14.2
+    image: dock.mau.dev/mautrix/telegram:v0.13.0
     depends_on:
       - telegramdb
     configs:
@@ -25,7 +25,6 @@ services:
       - HOMESERVER_URL
       - TELEGRAM_APP_ID
       - TELEGRAM_BRIDGE_PERMISSIONS
-      - TELEGRAM_SYNC_CHANNEL_MEMBERS
       - VERIFY_SSL
     secrets:
       - telegram_api_hash

compose.turn.yml

@@ -2,7 +2,7 @@
 version: "3.8"
 
 services:
-  synapse:
+  app:
     secrets:
       - db_password
       - form_secret

compose.yml

@@ -3,40 +3,11 @@ version: "3.8"
 
 services:
   app:
-    image: nginx:1.23.3
-    networks:
-      - proxy
-      - internal
-    environment:
-      - STACK_NAME
-    configs:
-      - source: nginx_config
-        target: /etc/nginx/nginx.conf
-      - source: wk_server
-        target: /var/www/.well-known/matrix/server
-      - source: wk_client
-        target: /var/www/.well-known/matrix/client
-    deploy:
-      restart_policy:
-        condition: on-failure
-      labels:
-        - "traefik.enable=true"
-        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
-        - "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=5.0.0+v1.93.0"
-        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
-    healthcheck:
-      test: curl -f http://synapse:8008/health || exit 1
-      interval: 5s
-      timeout: 3s
-      retries: 20
-
-  synapse:
-    image: "matrixdotorg/synapse:v1.93.0"
+    image: "matrixdotorg/synapse:v1.77.0"
     volumes:
       - "data:/data"
+    depends_on:
+      - db
     secrets:
       - db_password
       - registration_shared_secret
@@ -44,7 +15,6 @@ services:
       - form_secret
     environment:
       - ALLOWED_LIFETIME_MAX
-      - ALLOW_PUBLIC_ROOMS_FEDERATION
       - AUTO_JOIN_ROOM
       - AUTO_JOIN_ROOM_ENABLED
       - DISABLE_FEDERATION
@@ -71,6 +41,7 @@ services:
       - VIRTUAL_HOST=${DOMAIN}
       - VIRTUAL_PORT=8008
     networks:
+      - proxy
       - internal
     entrypoint: /docker-entrypoint.sh
     configs:
@@ -81,12 +52,16 @@ services:
       - source: entrypoint_conf
         target: /docker-entrypoint.sh
         mode: 0555
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 1m
+    deploy:
+      restart_policy:
+        condition: on-failure
+      labels:
+        - "traefik.enable=true"
+        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8008"
+        - "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.2.0+v1.77.0"
 
   db:
     image: postgres:13-alpine
@@ -99,15 +74,10 @@ services:
       - POSTGRES_INITDB_ARGS="-E \"UTF8\""
       - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
       - POSTGRES_USER=synapse
-      - DOMAIN
     networks:
       - internal
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "synapse"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 1m
+      test: ["CMD", "pg_isready", "-U", "$POSTGRES_USER" ]
     volumes:
       - postgres:/var/lib/postgresql/data
     deploy:
@@ -139,18 +109,6 @@ configs:
     name: ${STACK_NAME}_log_config_${LOG_CONFIG_VERSION}
     file: log.config.tmpl
     template_driver: golang
-  nginx_config:
-    name: ${STACK_NAME}_nginx_config_${NGINX_CONFIG_VERSION}
-    file: nginx.conf.tmpl
-    template_driver: golang
-  wk_server:
-    name: ${STACK_NAME}_wk_server_${WK_SERVER_VERSION}
-    file: well_known_server.conf.tmpl
-    template_driver: golang
-  wk_client:
-    name: ${STACK_NAME}_wk_client_${WK_CLIENT_VERSION}
-    file: well_known_client.conf.tmpl
-    template_driver: golang
 
 secrets:
   db_password:
@@ -158,10 +116,10 @@ secrets:
     name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
   registration_shared_secret:
     external: true
-    name: ${STACK_NAME}_registration_${SECRET_REGISTRATION_VERSION}
+    name: ${STACK_NAME}_db_password_${SECRET_REGISTRATION_SHARED_SECRET_VERSION}
   macaroon_secret_key:
     external: true
-    name: ${STACK_NAME}_macaroon_${SECRET_MACAROON_VERSION}
+    name: ${STACK_NAME}_db_password_${SECRET_MACAROON_SECRET_KEY_VERSION}
   form_secret:
     external: true
-    name: ${STACK_NAME}_form_secret_${SECRET_FORM_SECRET_VERSION}
+    name: ${STACK_NAME}_db_password_${SECRET_FORM_SECRET_VERSION}

homeserver.yaml.tmpl

@@ -38,7 +38,7 @@ modules:
 # lowercase and may contain an explicit port.
 # Examples: matrix.org, localhost:8080
 #
-server_name: {{ or (env "SERVER_NAME") (env "DOMAIN") }}
+server_name: {{ env "DOMAIN" }}
 
 # The public-facing base URL that clients use to access this Homeserver (not
 # including _matrix/...). This is the same URL a user might enter into the
@@ -78,7 +78,7 @@ allow_public_rooms_without_auth: false
 # If set to 'true', allows any other homeserver to fetch the server's public
 # rooms directory via federation. Defaults to 'false'.
 #
-allow_public_rooms_over_federation: {{ env "ALLOW_PUBLIC_ROOMS_FEDERATION" }}
+allow_public_rooms_over_federation: false
 
 listeners:
   # Unsecure HTTP listener: for when matrix traffic passes through a reverse proxy
@@ -427,12 +427,8 @@ signing_key_path: "/data/{{ env "DOMAIN" }}.signing.key"
 #      "ed25519:auto": "abcdefghijklmnopqrstuvwxyzabcdefghijklmopqr"
 #  - server_name: "my_other_trusted_server.example.com"
 #
-{{ if eq (env "ENABLE_ALLOWLIST") "1" }}
-{{ env "TRUSTED_KEYSERVERS" }}
-{{ else }}
 trusted_key_servers:
   - server_name: "matrix.org"
-{{ end }}
 
 ## Single sign-on integration ##
 
@@ -608,34 +604,6 @@ oidc_providers:
         display_name_template: "{{ "{{ user.name }}" }}"
   {{ end }}
 
-  {{ if eq (env "KEYCLOAK2_ENABLED") "1" }}
-  - idp_id: {{ env "KEYCLOAK2_ID" }}
-    idp_name: {{ env "KEYCLOAK2_NAME" }}
-    issuer: "{{ env "KEYCLOAK2_URL" }}"
-    client_id: "{{ env "KEYCLOAK2_CLIENT_ID" }}"
-    client_secret: "{{ secret "keycloak2_client_secret" }}"
-    scopes: ["openid", "profile"]
-    allow_existing_users: {{ env "KEYCLOAK2_ALLOW_EXISTING_USERS" }}
-    user_mapping_provider:
-      config:
-        localpart_template: "{{ "{{ user.preferred_username }}" }}"
-        display_name_template: "{{ "{{ user.name }}" }}"
-  {{ end }}
-
-  {{ if eq (env "KEYCLOAK3_ENABLED") "1" }}
-  - idp_id: {{ env "KEYCLOAK3_ID" }}
-    idp_name: {{ env "KEYCLOAK3_NAME" }}
-    issuer: "{{ env "KEYCLOAK3_URL" }}"
-    client_id: "{{ env "KEYCLOAK3_CLIENT_ID" }}"
-    client_secret: "{{ secret "keycloak3_client_secret" }}"
-    scopes: ["openid", "profile"]
-    allow_existing_users: {{ env "KEYCLOAK3_ALLOW_EXISTING_USERS" }}
-    user_mapping_provider:
-      config:
-        localpart_template: "{{ "{{ user.preferred_username }}" }}"
-        display_name_template: "{{ "{{ user.name }}" }}"
-  {{ end }}
-
 # Additional settings to use with single-sign on systems such as OpenID Connect,
 # SAML2 and CAS.
 #
@@ -691,7 +659,7 @@ email:
   # authentication is attempted.
   #
   smtp_user: {{ env "SMTP_USER" }}
-  smtp_pass: "{{ secret "smtp_password" }}"
+  smtp_pass: {{ secret "smtp_password" }}
 
   # Uncomment the following to require TLS transport security for SMTP.
   # By default, Synapse will connect over plain text, and will then switch to

nginx.conf.tmpl

@@ -1,31 +0,0 @@
-user www-data;
-
-events {
-  worker_connections 768;
-}
-
-http {
-  server {
-    listen 80;
-
-    access_log off;
-    error_log /dev/null;
-
-    server_name {{ env "DOMAIN" }};
-
-    location ~* ^(\/_matrix|\/_synapse\/client) {
-      proxy_pass http://{{ env "STACK_NAME"}}_synapse:8008;
-      proxy_set_header X-Forwarded-For $remote_addr;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header Host $host;
-      client_max_body_size 50M;
-      proxy_http_version 1.1;
-    }
-
-    location /.well-known/matrix/ {
-      root /var/www/;
-      default_type application/json;
-      add_header Access-Control-Allow-Origin  *;
-    }
-  }
-}

release/4.0.0+v1.93.0

@@ -1,8 +0,0 @@
-We had to rename some secrets: https://git.coopcloud.tech/coop-cloud/matrix-synapse/issues/35
-
-Copy the secrets:
-
-* `registration_shared_secret` to `registration`
-* `macaroon_secret_key` to `macaroon`
-
-Regeneration of these secrets should also work.

release/5.0.0+v1.93.0

@@ -1,17 +0,0 @@
-An Nginx proxy has been configured as the entrypoint for Synapse. This is not
-optional. This is done to counteract IP collection in Synapse itself. See more:
-
-!!! You MUST undeploy your Synapse install before upgrading to this version !!!
-
-This is because there have been a service rename in the recipe configuration:
-
-* `app` -> `synapse`
-
-This could break stuff in the recipe, so please report issues if you run into
-anything!
-
-    https://git.coopcloud.tech/coop-cloud/matrix-synapse/issues/38
-
-Thanks!
-
--- d1

telegram_bridge.yaml.tmpl

@@ -151,7 +151,7 @@ bridge:
     # Whether or not to sync the member list in channels.
     # If no channel admins have logged into the bridge, the bridge won't be able to sync the member
     # list regardless of this setting.
-    sync_channel_members: {{ env "TELEGRAM_SYNC_CHANNEL_MEMBERS" }}
+    sync_channel_members: true
     # Whether or not to skip deleted members when syncing members.
     skip_deleted_members: true
     # Whether or not to automatically synchronize contacts and chats of Matrix users logged into

well_known_client.conf.tmpl

@@ -1,5 +0,0 @@
-{
-  "m.homeserver": {
-    "base_url": "https://{{ env "DOMAIN" }}"
-  }
-}

well_known_server.conf.tmpl

@@ -1,3 +0,0 @@
-{
-  "m.server": "{{ env "DOMAIN" }}:443"
-}