diff --git a/roles/services/files/nginx/sites-available/luebeck.freifunk.net b/roles/services/files/nginx/sites-available/luebeck.freifunk.net index 323e8bc03beb6c44595757e4f11ca104f3d65d56..dde452c3d1042e3f621e636f3aede9810a646cba 100644 --- a/roles/services/files/nginx/sites-available/luebeck.freifunk.net +++ b/roles/services/files/nginx/sites-available/luebeck.freifunk.net @@ -1,52 +1,54 @@ server { - listen 80; - listen [::]:80; - - listen localhost:443 ssl http2; - listen [::]:443 ssl http2; - - server_name luebeck.freifunk.net ffhl.de ffhl; - - include snippets/acme.conf; - include snippets/tls.conf; - include snippets/https-redirect.conf; - - ssl_certificate /var/lib/acme/live/luebeck.freifunk.net/fullchain; - ssl_certificate_key /var/lib/acme/live/luebeck.freifunk.net/privkey; - - root /var/www/luebeck.freifunk.net; - - location ~ /map(/?.*) { - return 301 $scheme://map.luebeck.freifunk.net$1; - } - - location ~ /wiki(/?.*) { - return 301 https://wiki.luebeck.freifunk.net$1; - } - - location /firmware/ { - return 301 $scheme://firmware.luebeck.freifunk.net/; - } - - location /opkg/ { - return 301 $scheme://firmware.luebeck.freifunk.net/; - } - - location = /Moelln { - return 302 https://wiki.luebeck.freifunk.net/wiki/Moelln; - } + listen 80; + listen [::]:80; + listen localhost:443 ssl http2; + listen [::]:443 ssl http2; + server_name luebeck.freifunk.net ffhl.de ffhl; + + include snippets/acme.conf; + include snippets/tls.conf; + include snippets/https-redirect.conf; + + ssl_certificate /var/lib/acme/live/luebeck.freifunk.net/fullchain; + ssl_certificate_key /var/lib/acme/live/luebeck.freifunk.net/privkey; + + root /var/www/luebeck.freifunk.net; + + location / { + proxy_pass https://freifunk-luebeck.pages.chaotikum.org/ffhl-website/; + } + + location ~ /map(/?.*) { + return 301 $scheme://map.luebeck.freifunk.net$1; + } + + location ~ /wiki(/?.*) { + return 301 https://wiki.luebeck.freifunk.net$1; + } + + location /firmware/ { + return 301 $scheme://firmware.luebeck.freifunk.net/; + } + + location /opkg/ { + return 301 $scheme://firmware.luebeck.freifunk.net/; + } + + location = /Moelln { + return 302 https://wiki.luebeck.freifunk.net/wiki/Moelln; + } } server { - listen [::]:80; - listen [::]:443 ssl; - server_name xn--lbeck-kva.freifunk.net www.luebeck.freifunk.net www.ffhl.de; - - include snippets/acme.conf; - include snippets/tls.conf; + listen [::]:80; + listen [::]:443 ssl; + server_name xn--lbeck-kva.freifunk.net www.luebeck.freifunk.net www.ffhl.de; + + include snippets/acme.conf; + include snippets/tls.conf; - ssl_certificate /var/lib/acme/live/www.luebeck.freifunk.net/fullchain; - ssl_certificate_key /var/lib/acme/live/www.luebeck.freifunk.net/privkey; + ssl_certificate /var/lib/acme/live/www.luebeck.freifunk.net/fullchain; + ssl_certificate_key /var/lib/acme/live/www.luebeck.freifunk.net/privkey; - return 301 $scheme://luebeck.freifunk.net$request_uri; + return 301 $scheme://luebeck.freifunk.net$request_uri; }