diff --git a/deployment/nginx.conf b/deployment/nginx.conf index e8cdf2a7..e5c0611b 100644 --- a/deployment/nginx.conf +++ b/deployment/nginx.conf @@ -2,7 +2,7 @@ server { listen 8080; error_log /var/log/nginx/error.log notice; rewrite_log on; - resolver 127.0.0.1 valid=30s; + resolver 127.0.0.11 valid=30s; set $flaskfetfotos flaskfetfotos:8080; set $etherpad etherpad:9001; location /assets { @@ -15,19 +15,19 @@ server { try_files $uri =404; } - location /fotos { - proxy_ssl_server_name on; - proxy_ssl_verify off; - proxy_pass http://$flaskfetfotos; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; + # location /fotos { + # proxy_ssl_server_name on; + # proxy_ssl_verify off; + # proxy_pass http://$flaskfetfotos; + # proxy_http_version 1.1; + # proxy_set_header Upgrade $http_upgrade; # 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 Connection "upgrade"; + # proxy_set_header Connection "upgrade"; - } - + # } + # location /etherpad { rewrite /etherpad/(.*) /$1 break; rewrite ^/etherpad$ /etherpad/ permanent;