bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade proxy connection dev

Browse Source
This commit is contained in:
Andreas Stephanides
2020-12-28 23:33:42 +00:00
parent 4bc78e2c96
commit 027b8368c6
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
deployment/nginx.conf
View File

@@ -1,9 +1,12 @@
server { server {
listen 8080; listen 8080;
error_log /var/log/nginx/error.log notice;
rewrite_log on;
location /assets { location /assets {
alias /app/assets; alias /app/assets;
try_files $uri =404; try_files $uri =404;
} }
location /files { location /files {
@@ -13,7 +16,7 @@ server {
location /fotos { location /fotos {
proxy_ssl_server_name on; proxy_ssl_server_name on;
proxy_ssl_verify off; proxy_ssl_verify off;
proxy_pass http://flaskfetfotos:8080; proxy_pass http://flaskfetfotos:8080;
proxy_http_version 1.1; proxy_http_version 1.1;
@@ -26,25 +29,34 @@ server {
} }
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;
} }
location /dev { location /dev {
rewrite /dev/(.*) /$1 break; rewrite_log on;
rewrite ^/dev$ /dev/ permanent; rewrite /dev/(.*) /$1 break;
proxy_pass http://theia:3000; rewrite ^/dev$ /dev/ permanent;
#proxy_redirect / /etherpad/; proxy_set_header Host $host;
proxy_set_header Host $host; proxy_set_header Proxy "";
proxy_buffering off; proxy_set_header Upgrade $http_upgrade;
} proxy_set_header Connection "Upgrade";
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarde-Proto $scheme;
proxy_buffering off;
proxy_pass http://theia:3000;
#proxy_redirect / /etherpad/;
}
location / { location / {
include uwsgi_params; include uwsgi_params;
uwsgi_pass unix:///tmp/uwsgi.sock; uwsgi_pass unix:///tmp/uwsgi.sock;
} }
} }