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

remove extra locations

Browse Source
This commit is contained in:
Andreas Stephanides
2021-05-23 13:50:57 +00:00
parent 87dd5a9d0b
commit 802578bd82
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
config/default.conf
View File

@@ -4,10 +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 $etherpad etherpad;
set $dokuwiki dokuwiki;
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
client_max_body_size 10M; client_max_body_size 10M;
location / { location / {
# root /usr/share/nginx/html; # root /usr/share/nginx/html;
@@ -21,25 +19,18 @@ server {
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
} }
location /dokuwiki {
rewrite /dokuwiki/(.*) /$1 break; # location /etherpad {
rewrite ^/dokuwiki$ /dokuwiki/ permanent; # rewrite /etherpad/(.*) /$1 break;
proxy_pass http://$dokuwiki:8080; # rewrite ^/etherpad$ /etherpad/ permanent;
proxy_redirect / /dokuwiki/; # proxy_pass http://$etherpad:9001;
proxy_set_header Host $host; # proxy_redirect / /etherpad/;
proxy_buffering off; # proxy_set_header Host $host;
} # proxy_buffering off;
location /etherpad { # sub_filter /static/plugins/ /etherpad/static/plugins/;
rewrite /etherpad/(.*) /$1 break; # sub_filter /etherpad/etherpad/static/plugins/ /etherpad/static/plugins/;
rewrite ^/etherpad$ /etherpad/ permanent; # sub_filter_once off;
proxy_pass http://$etherpad:9001; # }
proxy_redirect / /etherpad/;
proxy_set_header Host $host;
proxy_buffering off;
sub_filter /static/plugins/ /etherpad/static/plugins/;
sub_filter /etherpad/etherpad/static/plugins/ /etherpad/static/plugins/;
sub_filter_once off;
}
location /dev { location /dev {
rewrite_log on; rewrite_log on;
rewrite /dev/(.*) /$1 break; rewrite /dev/(.*) /$1 break;