diff --git a/abra.sh b/abra.sh index 40e664f..36ac573 100644 --- 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 diff --git a/compose.discord.yml b/compose.discord.yml index a6ec3f1..84bc62d 100644 --- 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 diff --git a/compose.keycloak.yml b/compose.keycloak.yml index 8acf3bb..cd25d72 100644 --- a/compose.keycloak.yml +++ b/compose.keycloak.yml @@ -2,7 +2,7 @@ version: "3.8" services: - synapse: + app: secrets: - db_password - form_secret diff --git a/compose.keycloak2.yml b/compose.keycloak2.yml index 471c548..971b6cc 100644 --- a/compose.keycloak2.yml +++ b/compose.keycloak2.yml @@ -2,7 +2,7 @@ version: "3.8" services: - synapse: + app: secrets: - keycloak2_client_secret environment: diff --git a/compose.keycloak3.yml b/compose.keycloak3.yml index a89af2c..ec8514c 100644 --- a/compose.keycloak3.yml +++ b/compose.keycloak3.yml @@ -2,7 +2,7 @@ version: "3.8" services: - synapse: + app: secrets: - keycloak3_client_secret environment: diff --git a/compose.shared_secret_auth.yml b/compose.shared_secret_auth.yml index efa0c33..784b452 100644 --- 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: diff --git a/compose.signal.yml b/compose.signal.yml index 82ef95c..d6ee6be 100644 --- 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 diff --git a/compose.smtp.yml b/compose.smtp.yml index 592dc36..8349e5d 100644 --- a/compose.smtp.yml +++ b/compose.smtp.yml @@ -2,7 +2,7 @@ version: "3.8" services: - synapse: + app: secrets: - db_password - form_secret diff --git a/compose.telegram.yml b/compose.telegram.yml index f3f43e3..e64b28f 100644 --- 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 diff --git a/compose.turn.yml b/compose.turn.yml index 8711ec4..9f2ab7d 100644 --- a/compose.turn.yml +++ b/compose.turn.yml @@ -2,7 +2,7 @@ version: "3.8" services: - synapse: + app: secrets: - db_password - form_secret diff --git a/compose.yml b/compose.yml index 02ca385..d067ccb 100644 --- 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=5.0.6+v1.100.0" + - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8008/health"] interval: 30s diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl index d3ad0d5..350f954 100644 --- 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: diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl index 765746c..244eb83 100644 --- 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;