jimzah/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-01-09 15:54:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'simpler-traefik-nginx' into 'next'

Browse Source 
Make traefik+nginx config more self-contained

See merge request famedly/conduit!239
This commit is contained in:
Timo Kösters 2022-01-13 11:18:15 +00:00
commit f3ea2df9fe
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docker/README.md
View File

@ -94,26 +94,20 @@ So...step by step:
server_name <SUBDOMAIN>.<DOMAIN>; server_name <SUBDOMAIN>.<DOMAIN>;
listen 80 default_server; listen 80 default_server;
location /.well-known/matrix/ { location /.well-known/matrix/server {
root /var/www; return 200 '{"m.server": "<SUBDOMAIN>.<DOMAIN>:443"}';
default_type application/json; add_header Content-Type application/json;
add_header Access-Control-Allow-Origin *;
} }
}
```
- `./nginx/www/.well-known/matrix/client` (relative to the compose file, you can change this, but then also need to change the volume mapping) location /.well-known/matrix/client {
```json return 200 '{"m.homeserver": {"base_url": "https://<SUBDOMAIN>.<DOMAIN>"}}';
{ add_header Content-Type application/json;
"m.homeserver": { add_header "Access-Control-Allow-Origin" *;
"base_url": "https://<SUBDOMAIN>.<DOMAIN>"
} }
location / {
return 404;
} }
```
- `./nginx/www/.well-known/matrix/server` (relative to the compose file, you can change this, but then also need to change the volume mapping)
```json
{
"m.server": "<SUBDOMAIN>.<DOMAIN>:443"
} }
``` ```