m
This commit is contained in:
@@ -4,77 +4,49 @@ map $http_upgrade $connection_upgrade {
|
|||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl http2;
|
||||||
listen [::]:443 ssl;
|
listen [::]:443 ssl http2;
|
||||||
server_name etherpad.zinomedia.de;
|
server_name etherpad.zinomedia.de;
|
||||||
|
|
||||||
access_log off;
|
|
||||||
error_log /var/log/nginx/error.log error;
|
|
||||||
|
|
||||||
# SSL Certificate Configuration
|
|
||||||
ssl_certificate /etc/letsencrypt/live/etherpad.zinomedia.de/fullchain.pem;
|
ssl_certificate /etc/letsencrypt/live/etherpad.zinomedia.de/fullchain.pem;
|
||||||
ssl_certificate_key /etc/letsencrypt/live/etherpad.zinomedia.de/privkey.pem;
|
ssl_certificate_key /etc/letsencrypt/live/etherpad.zinomedia.de/privkey.pem;
|
||||||
|
|
||||||
include "snippets/ssl-optimizations.conf";
|
include "snippets/ssl-optimizations.conf";
|
||||||
|
|
||||||
# Password protect
|
|
||||||
auth_basic "Protected";
|
auth_basic "Protected";
|
||||||
auth_basic_user_file /usr/share/nginx/html/etherpad.zinomedia.de/.htpasswd;
|
auth_basic_user_file /usr/share/nginx/html/etherpad.zinomedia.de/.htpasswd;
|
||||||
|
|
||||||
location ~ ^/(locales/|locales.json|admin/|static/|pluginfw/|javascripts/|socket.io/|ep/|minified/|api/|ro/|error/|jserror/|favicon.ico|robots.txt|.*\.js) {
|
resolver 127.0.0.11 valid=30s ipv6=off;
|
||||||
resolver 127.0.0.11;
|
|
||||||
|
location ~ ^/(locales/|locales\.json|admin/|static/|pluginfw/|javascripts/|socket\.io/|ep/|minified/|api/|ro/|error/|jserror|redirect|favicon\.ico|robots\.txt|indexBootstrap-.*\.js)$ {
|
||||||
set $upstream "http://etherpad:9001";
|
set $upstream "http://etherpad:9001";
|
||||||
proxy_pass $upstream;
|
proxy_pass $upstream;
|
||||||
|
|
||||||
proxy_buffering off;
|
proxy_buffering off;
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_pass_header Server;
|
|
||||||
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Host $host;
|
||||||
|
proxy_set_header Upgrade $http_upgrade; # websockets
|
||||||
proxy_set_header Connection $connection_upgrade;
|
proxy_set_header Connection $connection_upgrade;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /p/ {
|
location ~ ^/(?!locales/|locales\.json|admin/|static/|pluginfw/|javascripts/|socket\.io/|ep/|minified/|api/|ro/|error/|jserror|redirect|favicon\.ico|robots\.txt|indexBootstrap-.*\.js)([^/].+)$ {
|
||||||
rewrite ^/p/(.*) /$1 redirect;
|
return 301 /p/$1;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^/$ {
|
location = / {
|
||||||
resolver 127.0.0.11;
|
|
||||||
set $upstream "http://etherpad:9001";
|
set $upstream "http://etherpad:9001";
|
||||||
proxy_pass $upstream;
|
proxy_pass $upstream;
|
||||||
|
|
||||||
proxy_buffering off;
|
proxy_buffering off;
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_pass_header Server;
|
|
||||||
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection $connection_upgrade;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
location / {
|
|
||||||
resolver 127.0.0.11;
|
|
||||||
set $upstream "http://etherpad:9001";
|
|
||||||
proxy_pass $upstream;
|
|
||||||
|
|
||||||
proxy_redirect / /p/;
|
|
||||||
|
|
||||||
proxy_buffering off;
|
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_pass_header Server;
|
|
||||||
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $remote_addr;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
proxy_http_version 1.1;
|
proxy_set_header X-Forwarded-Host $host;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection $connection_upgrade;
|
proxy_set_header Connection $connection_upgrade;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user