diff --git a/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml b/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml index 99580f5..7a90d1a 100644 --- a/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml +++ b/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml @@ -10,9 +10,9 @@ services: #volumes: # - ./element/config.json.sh:/app/config.json.sh #command: sh -c "/app/config.json.sh && nginx -g 'daemon off;'" - entrypoint: /app/config.json.sh + #entrypoint: /app/config.json.sh ports: - - "80:80/tcp" + - "8008:80/tcp" nginx: image: nginx:${NGINX_VERSION} @@ -22,3 +22,4 @@ services: volumes: - ./nginx:/etc/nginx/conf.d - /ssl:/ssl + - /www:/www diff --git a/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf b/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf index 4bb2dbb..2370b4d 100644 --- a/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf +++ b/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf @@ -6,24 +6,12 @@ server { ssl_certificate /ssl/chain.crt; ssl_certificate_key /ssl/certificate.keyplain; - client_max_body_size 100m; - error_page 403 404 /403_404.html; location = /403_404.html { default_type application/json; return 200 'You are not authorized to access this page.'; } - location /.well-known/matrix/server { - default_type application/json; - return 200 '{"m.server": "ungleich.matrix.ungleich.cloud:443" }'; - } - location /.well-known/matrix/client { - default_type application/json; - return 200 '{ "m.homeserver": { "base_url": "https://ungleich.matrix.ungleich.cloud" } }'; - } - - location / { proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; @@ -34,6 +22,6 @@ server { proxy_read_timeout 600s; send_timeout 600s; - proxy_pass http://elementweb:8008; + proxy_pass http://elementweb; } } diff --git a/ansible/roles/docker-compose/files/synapse/config/homeserver.yaml b/ansible/roles/docker-compose/files/synapse/config/homeserver.yaml index 8d391e9..46d8d4e 100755 --- a/ansible/roles/docker-compose/files/synapse/config/homeserver.yaml +++ b/ansible/roles/docker-compose/files/synapse/config/homeserver.yaml @@ -2275,7 +2275,7 @@ sso: oidc_providers: - idp_id: keycloak - idp_name: "Corp Login" + idp_name: "Corp Login" issuer: "https://idp.corp-serv.net/realms/MAT" client_id: "synapse" client_secret: "vulBbPIatTqthf3wVgWbXjrLa00Ejk913gQEqgFhZm6FTJj4rc5CWgGGIBjH6CBDaAmeyZ4Tgs0iK7w9tannkaY8u3ziW4vhU0Ji" diff --git a/ansible/roles/docker-compose/files/synapse/nginx/synapse.conf b/ansible/roles/docker-compose/files/synapse/nginx/synapse.conf index 8213020..ac3376c 100644 --- a/ansible/roles/docker-compose/files/synapse/nginx/synapse.conf +++ b/ansible/roles/docker-compose/files/synapse/nginx/synapse.conf @@ -14,15 +14,9 @@ server { return 200 'You are not authorized to access this page.'; } - location /.well-known/matrix/server { - default_type application/json; - return 200 '{"m.server": "ungleich.matrix.ungleich.cloud:443" }'; + location / { + root /www; } - location /.well-known/matrix/client { - default_type application/json; - return 200 '{ "m.homeserver": { "base_url": "https://ungleich.matrix.ungleich.cloud" } }'; - } - location ~ /_matrix|/_synapse { proxy_set_header X-Forwarded-For $remote_addr;