diff --git a/.env.sample b/.env.sample index b7dd5d3..f1f4304 100644 --- a/.env.sample +++ b/.env.sample @@ -2,7 +2,7 @@ POSTGRES_USER=user POSTGRES_PASSWORD=password POSTGRES_DB=db SWAG_URL=example.tld -SWAG_SUBDOMAINS=matrix, dimension, adminer, maubot +SWAG_SUBDOMAINS=matrix, dimension, maubot SWAG_EMAIL=email@example.tld DIMENSION_DB_USER=user DIMENSION_DB_PASSWORD=password diff --git a/docker-compose.yml b/docker-compose.yml index 041bef8..71fbdbe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -196,8 +196,6 @@ services: - ./files:/data:Z depends_on: - synapse - ports: - - 127.0.0.1:8094:8081 security_opt: - no-new-privileges:true cap_drop: @@ -214,8 +212,6 @@ services: - ./files:/data:Z depends_on: - synapse - ports: - - 127.0.0.1:8093:8081 security_opt: - no-new-privileges:true cap_drop: @@ -233,8 +229,6 @@ services: - ./files:/data:Z depends_on: - synapse - ports: - - 127.0.0.1:8092:8081 security_opt: - no-new-privileges:true cap_drop: @@ -252,8 +246,6 @@ services: - ./files:/data:Z depends_on: - synapse - ports: - - 127.0.0.1:8091:8081 security_opt: - no-new-privileges:true cap_drop: @@ -271,8 +263,6 @@ services: - ./files:/data:Z depends_on: - synapse - ports: - - 127.0.0.1:8090:8081 security_opt: - no-new-privileges:true cap_drop: @@ -290,8 +280,6 @@ services: - ./files:/data:Z depends_on: - synapse - ports: - - 127.0.0.1:8086:8034 security_opt: - no-new-privileges:true cap_drop: @@ -311,8 +299,6 @@ services: - synapse networks: - matrix - ports: - - 127.0.0.1:8085:8034 security_opt: - no-new-privileges:true cap_drop: @@ -332,8 +318,6 @@ services: - synapse networks: - matrix - ports: - - 127.0.0.1:8087:8034 security_opt: - no-new-privileges:true cap_drop: @@ -353,8 +337,6 @@ services: - synapse networks: - matrix - ports: - - 127.0.0.1:8088:8034 security_opt: - no-new-privileges:true cap_drop: @@ -374,8 +356,6 @@ services: - synapse networks: - matrix - ports: - - 127.0.0.1:8083:8081 security_opt: - no-new-privileges:true cap_drop: @@ -395,8 +375,6 @@ services: - synapse networks: - matrix - ports: - - 127.0.0.1:8082:8081 security_opt: - no-new-privileges:true cap_drop: @@ -416,8 +394,6 @@ services: - synapse networks: - matrix - ports: - - 127.0.0.1:8081:8081 security_opt: - no-new-privileges:true cap_drop: @@ -437,8 +413,6 @@ services: - synapse networks: - matrix - ports: - - 127.0.0.1:8080:8081 security_opt: - no-new-privileges:true cap_drop: diff --git a/swag/nginx/include.d/upstream_workers.conf b/swag/nginx/include.d/upstream_workers.conf index ecf54b1..0f6d4a5 100644 --- a/swag/nginx/include.d/upstream_workers.conf +++ b/swag/nginx/include.d/upstream_workers.conf @@ -1,17 +1,17 @@ upstream generic_worker_ih { ip_hash; - server synapse-generic-worker-1:8080; + server synapse-generic-worker-1:8081; server synapse-generic-worker-2:8081; - server synapse-generic-worker-3:8082; - server synapse-generic-worker-4:8083; + server synapse-generic-worker-3:8081; + server synapse-generic-worker-4:8081; } upstream generic_worker_lc { least_conn; - server synapse-generic-worker-1:8080; + server synapse-generic-worker-1:8081; server synapse-generic-worker-2:8081; - server synapse-generic-worker-3:8082; - server synapse-generic-worker-4:8083; + server synapse-generic-worker-3:8081; + server synapse-generic-worker-4:8081; } # extract username from token get parameter @@ -31,14 +31,14 @@ map $http_authorization $proxy_username_label { upstream sync_worker { # pin with username extracted from bearer token or access_token hash $proxy_username_label consistent; - server sync1:8090; - server sync2:8091; - server sync3:8092; + server sync1:8081; + server sync2:8081; + server sync3:8081; } upstream sync_init { # Use the username mapper result for hash key hash $mxid_localpart consistent; - server sync4:8093; - server sync5:8094; + server sync4:8081; + server sync5:8081; } \ No newline at end of file