This commit is contained in:
deathrow 2022-11-30 09:00:49 -05:00
parent 3aaf8c3477
commit deb841e1ba
No known key found for this signature in database
GPG Key ID: FF39D67A22069F73
3 changed files with 12 additions and 38 deletions

View File

@ -2,7 +2,7 @@ POSTGRES_USER=user
POSTGRES_PASSWORD=password POSTGRES_PASSWORD=password
POSTGRES_DB=db POSTGRES_DB=db
SWAG_URL=example.tld SWAG_URL=example.tld
SWAG_SUBDOMAINS=matrix, dimension, adminer, maubot SWAG_SUBDOMAINS=matrix, dimension, maubot
SWAG_EMAIL=email@example.tld SWAG_EMAIL=email@example.tld
DIMENSION_DB_USER=user DIMENSION_DB_USER=user
DIMENSION_DB_PASSWORD=password DIMENSION_DB_PASSWORD=password

View File

@ -196,8 +196,6 @@ services:
- ./files:/data:Z - ./files:/data:Z
depends_on: depends_on:
- synapse - synapse
ports:
- 127.0.0.1:8094:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -214,8 +212,6 @@ services:
- ./files:/data:Z - ./files:/data:Z
depends_on: depends_on:
- synapse - synapse
ports:
- 127.0.0.1:8093:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -233,8 +229,6 @@ services:
- ./files:/data:Z - ./files:/data:Z
depends_on: depends_on:
- synapse - synapse
ports:
- 127.0.0.1:8092:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -252,8 +246,6 @@ services:
- ./files:/data:Z - ./files:/data:Z
depends_on: depends_on:
- synapse - synapse
ports:
- 127.0.0.1:8091:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -271,8 +263,6 @@ services:
- ./files:/data:Z - ./files:/data:Z
depends_on: depends_on:
- synapse - synapse
ports:
- 127.0.0.1:8090:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -290,8 +280,6 @@ services:
- ./files:/data:Z - ./files:/data:Z
depends_on: depends_on:
- synapse - synapse
ports:
- 127.0.0.1:8086:8034
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -311,8 +299,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 127.0.0.1:8085:8034
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -332,8 +318,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 127.0.0.1:8087:8034
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -353,8 +337,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 127.0.0.1:8088:8034
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -374,8 +356,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 127.0.0.1:8083:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -395,8 +375,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 127.0.0.1:8082:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -416,8 +394,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 127.0.0.1:8081:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:
@ -437,8 +413,6 @@ services:
- synapse - synapse
networks: networks:
- matrix - matrix
ports:
- 127.0.0.1:8080:8081
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
cap_drop: cap_drop:

View File

@ -1,17 +1,17 @@
upstream generic_worker_ih { upstream generic_worker_ih {
ip_hash; ip_hash;
server synapse-generic-worker-1:8080; server synapse-generic-worker-1:8081;
server synapse-generic-worker-2:8081; server synapse-generic-worker-2:8081;
server synapse-generic-worker-3:8082; server synapse-generic-worker-3:8081;
server synapse-generic-worker-4:8083; server synapse-generic-worker-4:8081;
} }
upstream generic_worker_lc { upstream generic_worker_lc {
least_conn; least_conn;
server synapse-generic-worker-1:8080; server synapse-generic-worker-1:8081;
server synapse-generic-worker-2:8081; server synapse-generic-worker-2:8081;
server synapse-generic-worker-3:8082; server synapse-generic-worker-3:8081;
server synapse-generic-worker-4:8083; server synapse-generic-worker-4:8081;
} }
# extract username from token get parameter # extract username from token get parameter
@ -31,14 +31,14 @@ map $http_authorization $proxy_username_label {
upstream sync_worker { upstream sync_worker {
# pin with username extracted from bearer token or access_token # pin with username extracted from bearer token or access_token
hash $proxy_username_label consistent; hash $proxy_username_label consistent;
server sync1:8090; server sync1:8081;
server sync2:8091; server sync2:8081;
server sync3:8092; server sync3:8081;
} }
upstream sync_init { upstream sync_init {
# Use the username mapper result for hash key # Use the username mapper result for hash key
hash $mxid_localpart consistent; hash $mxid_localpart consistent;
server sync4:8093; server sync4:8081;
server sync5:8094; server sync5:8081;
} }