andis/intern2020
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

port dokuwiki fix

Browse Source
This commit is contained in:
Andreas Stephanides
2021-01-23 13:38:07 +00:00
parent a2028d2266
commit 75add4695f
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/nginx/default.conf
View File

@@ -4,7 +4,8 @@ server {
server_name localhost; server_name localhost;
resolver 127.0.0.11 valid=30s; resolver 127.0.0.11 valid=30s;
set $theia theia; set $theia theia;
set $etherpad etherpad;
set $dokuwiki dokuwiki;
#charset koi8-r; #charset koi8-r;
#access_log /var/log/nginx/host.access.log main; #access_log /var/log/nginx/host.access.log main;
@@ -20,10 +21,18 @@ server {
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
} }
location /dokuwiki {
rewrite /dokuwiki/(.*) /$1 break;
rewrite ^/dokuwiki$ /dokuwiki/ permanent;
proxy_pass http://$dokuwiki:8080;
proxy_redirect / /dokuwiki/;
proxy_set_header Host $host;
proxy_buffering off;
}
location /etherpad { location /etherpad {
rewrite /etherpad/(.*) /$1 break; rewrite /etherpad/(.*) /$1 break;
rewrite ^/etherpad$ /etherpad/ permanent; rewrite ^/etherpad$ /etherpad/ permanent;
proxy_pass http://etherpad:9001; proxy_pass http://$etherpad:9001;
proxy_redirect / /etherpad/; proxy_redirect / /etherpad/;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_buffering off; proxy_buffering off;