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

remove fotos and change resolver in nginx conf

Browse Source
This commit is contained in:
Andreas Stephanides
2023-01-01 14:27:43 +01:00
parent 1a3f87ef9e
commit 7ab97c91b7
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
deployment/nginx.conf
View File

@@ -2,7 +2,7 @@ server {
listen 8080; listen 8080;
error_log /var/log/nginx/error.log notice; error_log /var/log/nginx/error.log notice;
rewrite_log on; rewrite_log on;
resolver 127.0.0.1 valid=30s; resolver 127.0.0.11 valid=30s;
set $flaskfetfotos flaskfetfotos:8080; set $flaskfetfotos flaskfetfotos:8080;
set $etherpad etherpad:9001; set $etherpad etherpad:9001;
location /assets { location /assets {
@@ -15,19 +15,19 @@ server {
try_files $uri =404; try_files $uri =404;
} }
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; # proxy_pass http://$flaskfetfotos;
proxy_http_version 1.1; # proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; # proxy_set_header Upgrade $http_upgrade;
# proxy_set_header REMOTE-USER $http_REMOTE_USER; # proxy_set_header REMOTE-USER $http_REMOTE_USER;
# proxy_set_header X-Forwarded-User $http_REMOTE_USER; # proxy_set_header X-Forwarded-User $http_REMOTE_USER;
# proxy_set_header x-forwarded-user $http_REMOTE_USER; # proxy_set_header x-forwarded-user $http_REMOTE_USER;
proxy_set_header Connection "upgrade"; # proxy_set_header Connection "upgrade";
} # }
#
location /etherpad { location /etherpad {
rewrite /etherpad/(.*) /$1 break; rewrite /etherpad/(.*) /$1 break;
rewrite ^/etherpad$ /etherpad/ permanent; rewrite ^/etherpad$ /etherpad/ permanent;