diff --git a/docker-compose.yml b/docker-compose.yml index 53acfae..375ac48 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,6 +66,35 @@ services: labels: - "com.centurylinklabs.watchtower.enable=false" + sliding-sync: + image: ghcr.io/matrix-org/sliding-sync + container_name: sliding-sync + restart: unless-stopped + environment: + - "SYNCV3_SECRET=${SYNCV3_SECRET}" + - "SYNCV3_SERVER=${SYNCV3_SERVER}" + - "SYNCV3_DB=${SYNCV3_DB}" + - "SYNCV3_BINDADDR=${SYNCV3_BINDADDR}" + depends_on: + - sliding-postgres + networks: + - matrix + + sliding-postgres: + image: docker.io/postgres:16-alpine + container_name: sliding-postgres + restart: unless-stopped + environment: + - "POSTGRES_USER=${SLIDING_POSTGRES_USER}" + - "POSTGRES_PASSWORD=${SLIDING_POSTGRES_PASSWORD}" + - "POSTGRES_DB=${SLIDING_POSTGRES_DB}" + volumes: + - ./sliding-sync-db:/var/lib/postgresql/data + networks: + - matrix + labels: + - "com.centurylinklabs.watchtower.enable=false" + swag: image: ghcr.io/linuxserver/swag restart: unless-stopped diff --git a/images/synapse-docker/Dockerfile b/images/synapse-docker/Dockerfile index 862a9fc..dbcfb09 100644 --- a/images/synapse-docker/Dockerfile +++ b/images/synapse-docker/Dockerfile @@ -1,4 +1,4 @@ -ARG SYNAPSE_VERSION=1.108.0 +ARG SYNAPSE_VERSION=1.109.0 ARG HARDENED_MALLOC_VERSION=11 ARG UID=991 ARG GID=991 diff --git a/images/synapse-worker-docker/Dockerfile b/images/synapse-worker-docker/Dockerfile index fc3d08c..19b6d45 100644 --- a/images/synapse-worker-docker/Dockerfile +++ b/images/synapse-worker-docker/Dockerfile @@ -1,4 +1,4 @@ -ARG SYNAPSE_VERSION=1.108.0 +ARG SYNAPSE_VERSION=1.109.0 ARG HARDENED_MALLOC_VERSION=11 ARG UID=991 ARG GID=991 diff --git a/swag/nginx/site-confs/matrix.conf b/swag/nginx/site-confs/matrix.conf index 48429b9..639b424 100644 --- a/swag/nginx/site-confs/matrix.conf +++ b/swag/nginx/site-confs/matrix.conf @@ -30,10 +30,21 @@ server { } location /.well-known/matrix/client { - default_type application/json; - add_header Access-Control-Allow-Origin *; + default_type application/json; + add_header Access-Control-Allow-Origin *; - } + # Add the new configuration block + return 200 ' +{ + "m.homeserver": { + "base_url": "https://hackliberty.org" + }, + "org.matrix.msc3575.proxy": { + "url": "https://hackliberty.org" + } +} +'; + } #Home Page include /config/nginx/include.d/homepage.conf; @@ -77,6 +88,14 @@ server { # Sync_Worker #include /config/nginx/include.d/sync_worker.conf; + location ~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync) { + include /config/nginx/include.d/synapse-proxy.conf; + set $upstream_app sliding-sync; + set $upstream_port 8009; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; +} + location ~ ^(/_matrix.*) { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf;