sort out the network

This commit is contained in:
Matthew Hodgson
2024-11-04 22:33:46 +00:00
parent 1ad060cc0f
commit ec2cacdb47
5 changed files with 53 additions and 26 deletions

View File

@@ -25,7 +25,7 @@ server {
include /etc/nginx/conf.d/include/ssl.conf;
location / {
proxy_pass http://element-web:8080;
proxy_pass http://element-web;
}
}
@@ -36,7 +36,7 @@ server {
include /etc/nginx/conf.d/include/ssl.conf;
location / {
proxy_pass http://element-call:8082;
proxy_pass http://element-call;
}
}
@@ -47,7 +47,7 @@ server {
include /etc/nginx/conf.d/include/ssl.conf;
location / {
proxy_pass http://auth:8083;
proxy_pass http://matrix-authentication-service:8080;
}
}
@@ -62,7 +62,7 @@ server {
listen [::]:8448 ssl default_server;
# pass auth to MAS
location ~ ^/_matrix/client/(.*)/(login|logout|refresh) { proxy_pass http://auth:8083; }
location ~ ^/_matrix/client/(.*)/(login|logout|refresh) { proxy_pass http://matrix-authentication-service:8080; }
# use the generic worker as a synchrotron:
# taken from https://element-hq.github.io/synapse/latest/workers.html#synapseappgeneric_worker

View File

@@ -6,5 +6,5 @@
# include /etc/letsencrypt/options-ssl-nginx.conf;
# ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
ssl_certificate /etc/nginx/ssl/client.pem;
ssl_certificate /etc/nginx/ssl/cert.pem;
ssl_certificate_key /etc/nginx/ssl/key.pem;

View File

@@ -64,6 +64,11 @@ redis:
host: redis
port: 6379
# as we want our first launch and subsequent upgrades to go as fast
# as possible don't sleep between background updates
background_updates:
sleep_enabled: false
email:
smtp_host: mailhog
smtp_port: 1025
@@ -90,7 +95,7 @@ email:
experimental_features:
msc3861: # OIDC
enabled: true
issuer: http://localhost:8080/
issuer: http://matrix-authentication-service:8080/
client_id: ${MAS_CLIENT_ID}
client_auth_method: client_secret_basic
client_secret: '${SECRETS_MAS_CLIENT_SECRET}'