chore: publish 6.0.1+v1.100.0 release

Update release notes
[ci skip]
2024-04-13 11:05:40 -03:00 · 2024-04-13 11:05:21 -03:00 · 2024-04-12 12:31:50 -03:00 · 2024-04-12 12:30:05 -03:00
18 changed files with 32 additions and 50 deletions
--- a/abra.sh
+++ b/abra.sh
@ -1,11 +1,11 @@
 export DISCORD_BRIDGE_YAML_VERSION=v2
 export ENTRYPOINT_CONF_VERSION=v2
-export HOMESERVER_YAML_VERSION=v27
+export HOMESERVER_YAML_VERSION=v28
 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=v5
+export NGINX_CONFIG_VERSION=v6
 export WK_SERVER_VERSION=v1
 export WK_CLIENT_VERSION=v1

--- a/compose.discord.yml
+++ b/compose.discord.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    environment:
      - APP_SERVICES_ENABLED
      - APP_SERVICE_CONFIGS
--- a/compose.keycloak.yml
+++ b/compose.keycloak.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    secrets:
      - db_password
      - form_secret
--- a/compose.keycloak2.yml
+++ b/compose.keycloak2.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    secrets:
      - keycloak2_client_secret
    environment:
--- a/compose.keycloak3.yml
+++ b/compose.keycloak3.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    secrets:
      - keycloak3_client_secret
    environment:
--- a/compose.shared_secret_auth.yml
+++ b/compose.shared_secret_auth.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    environment:
      - SHARED_SECRET_AUTH_ENABLED
    secrets:
--- a/compose.signal.yml
+++ b/compose.signal.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    environment:
      - APP_SERVICES_ENABLED
      - APP_SERVICE_CONFIGS
--- a/compose.smtp.yml
+++ b/compose.smtp.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    secrets:
      - db_password
      - form_secret
--- a/compose.telegram.yml
+++ b/compose.telegram.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    environment:
      - APP_SERVICES_ENABLED
      - APP_SERVICE_CONFIGS
--- a/compose.turn.yml
+++ b/compose.turn.yml
@ -2,7 +2,7 @@
 version: "3.8"

 services:
-  synapse:
+  app:
    secrets:
      - db_password
      - form_secret
--- a/compose.yml
+++ b/compose.yml
@ -2,12 +2,13 @@
 version: "3.8"

 services:
-  app:
+  web:
    image: nginx:1.25.3
    networks:
      - proxy
      - internal
    environment:
+      - DOMAIN
      - STACK_NAME
      - NGINX_ACCESS_LOG_LOCATION
      - NGINX_ERROR_LOG_LOCATION
@ -27,15 +28,13 @@ 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=5.0.5+v1.100.0"
-        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
    healthcheck:
-      test: curl -f http://synapse:8008/health || exit 1
+      test: curl -f http://${STACK_NAME}_app:8008/health || exit 1
      interval: 5s
      timeout: 3s
      retries: 20

-  synapse:
+  app:
    image: "matrixdotorg/synapse:v1.100.0"
    volumes:
      - "data:/data"
@ -87,6 +86,12 @@ services:
      - source: entrypoint_conf
        target: /docker-entrypoint.sh
        mode: 0555
+    deploy:
+      restart_policy:
+        condition: on-failure
+      labels:
+        - "coop-cloud.${STACK_NAME}.version=6.0.1+v1.100.0"
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:8008/health"]
      interval: 30s
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@ -23,7 +23,7 @@ serve_server_wellknown: {{ env "SERVE_SERVER_WELLKNOWN" }}
 allow_public_rooms_without_auth: false

 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#allow_public_rooms_over_federation
-allow_public_rooms_over_federation: {{ env "ALLOW_PUBLIC_ROOMS_FEDERATION" }}
+allow_public_rooms_over_federation: {{ or (env "ALLOW_PUBLIC_ROOMS_FEDERATION") "true" }}

 # https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#listeners
 listeners:
--- a/nginx.conf.tmpl
+++ b/nginx.conf.tmpl
@ -8,13 +8,13 @@ http {
  server {
    listen 80;

-    access_log {{ env "NGINX_ACCESS_LOG_LOCATION" }};
-    error_log {{ env "NGINX_ERROR_LOG_LOCATION" }};
+    access_log {{ or (env "NGINX_ACCESS_LOG_LOCATION") "/dev/null" }};
+    error_log {{ or (env "NGINX_ERROR_LOG_LOCATION") "/dev/null" }};

    server_name {{ env "DOMAIN" }};

    location ~* ^(\/_matrix|\/_synapse\/client) {
-      proxy_pass http://{{ env "STACK_NAME"}}_synapse:8008;
+      proxy_pass http://{{ env "STACK_NAME"}}_app:8008;
      proxy_set_header X-Forwarded-For $remote_addr;
      proxy_set_header X-Forwarded-Proto https;
      proxy_set_header Host $host;
--- a/release/4.0.0+v1.93.0
+++ b/release/4.0.0+v1.93.0
@ -5,4 +5,6 @@ Copy the secrets:
 * `registration_shared_secret` to `registration`
 * `macaroon_secret_key` to `macaroon`

+The easiest way to do this is to run `abra app run <matrix.example.com> app bash` BEFORE this upgrade, then `cat /run/secrets/registration_shared_secret`.  If you haven't saved the secrets yet, and would like to, please Ctrl+C out of this upgrade and do that first.
+
 Regeneration of these secrets should also work.
--- a/release/5.0.0+v1.93.0
+++ b/release/5.0.0+v1.93.0
@ -1,17 +1 @@
-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
+It's recommended not to upgrade / downgrade directly to this version (or other 5.y.z versions), because of service renaming which was reverted in 6.0.0+v1.100.0.
--- a/release/5.0.1+v1.93.0
+++ b/release/5.0.1+v1.93.0
@ -1,8 +1,6 @@
-take care when upgrading! You need to add two variables to your .env file:
-use the following if you don't want any access logs (including users' IP addresses):
-NGINX_ACCESS_LOG_LOCATION="/dev/null"
-NGINX_ERROR_LOG_LOCATION="/dev/null"
+Logging is now disabled by default. If you want to reënable it, set these options:

-use the following if you want logs:
+```
 NGINX_ACCESS_LOG_LOCATION="/dev/stdout"
 NGINX_ERROR_LOG_LOCATION="/dev/stderr"
+```
--- a/release/5.0.4+v1.100.0
+++ b/release/5.0.4+v1.100.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.
--- a/release/6.0.0+v1.100.0
+++ b/release/6.0.0+v1.100.0
@ -0,0 +1 @@
+If you are upgrading from verison 5.y.z of this recipe, you will need to `undeploy` then `deploy`, because of a service rename which was reverted.
Author	SHA1	Message	Date
3wc	86106b6b6f	chore: publish 6.0.1+v1.100.0 release Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone/tag Build is passing Details	2024-04-13 11:05:40 -03:00
3wc	8250916051	Update release notes [ci skip]	2024-04-13 11:05:21 -03:00
3wc	e007bda255	chore: publish 6.0.0+v1.100.0 release Some checks failed continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is failing Details	2024-04-12 12:31:50 -03:00
3wc	951fc56434	app → web, synapse → app Fixes #42	2024-04-12 12:30:05 -03:00
				`@ -0,0 +1 @@`
				If you are upgrading from verison 5.y.z of this recipe, you will need to `undeploy` then `deploy`, because of a service rename which was reverted.