diff --git a/roles/services/files/nginx/sites-available/git.luebeck.freifunk.net b/roles/services/files/nginx/sites-available/git.luebeck.freifunk.net index 24d7ec1f26ef1a44340893362bc2fd42639617a7..f11ebff09d32bd4028fe20bbe9d05eba620848eb 100644 --- a/roles/services/files/nginx/sites-available/git.luebeck.freifunk.net +++ b/roles/services/files/nginx/sites-available/git.luebeck.freifunk.net @@ -1,39 +1,33 @@ include snippets/geoblock.conf; server { - listen 80; - listen [::]:80; - listen localhost:443 ssl http2; - listen [::]:443 ssl http2; - - server_name git.ffhl git.luebeck.freifunk.net git.ffhl.de; - - # TLS - 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; - - if ($ssl_protocol = "") { - # force TLS - return 301 https://$host$request_uri; - } - - - client_max_body_size 256M; - - # apply geoblocking - if ($allowed_country = no) { - return 302 https://luebeck.freifunk.net/; - } - - location / { - proxy_set_header Host $host; - proxy_pass http://localhost:3001/; - proxy_connect_timeout 300; - proxy_send_timeout 300; - proxy_read_timeout 300; - send_timeout 300; - } -} + listen 80; + listen [::]:80; + listen localhost:443 ssl http2; + listen [::]:443 ssl http2; + + server_name git.ffhl git.luebeck.freifunk.net git.ffhl.de; + + # TLS + 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; + + if ($ssl_protocol = "") { + # force TLS + return 301 https://$host$request_uri; + } + + client_max_body_size 256M; + + # apply geoblocking + if ($allowed_country = no) { + return 302 https://luebeck.freifunk.net/; + } + + location / { + return 301 https://git.chaotikum.org/freifunk-luebeck; + } +} diff --git a/roles/services/files/nginx/sites-available/wiki b/roles/services/files/nginx/sites-available/wiki index 7590be7747173521fbad8240afb7a4d240d59521..1e6fcb35ddb01c6ecdb2f761935ac0ce356505dd 100644 --- a/roles/services/files/nginx/sites-available/wiki +++ b/roles/services/files/nginx/sites-available/wiki @@ -1,16 +1,21 @@ server { - listen 80; - listen [::]:80; - listen localhost:443 ssl http2; - listen [::]:443 ssl http2; + listen 80; + listen [::]:80; + listen localhost:443 ssl http2; + listen [::]:443 ssl http2; - server_name wiki.luebeck.freifunk.net wiki.ffhl.de wiki.ffhl; - - include snippets/acme.conf; - include snippets/tls.conf; + server_name wiki.luebeck.freifunk.net wiki.ffhl.de wiki.ffhl; - ssl_certificate /var/lib/acme/live/luebeck.freifunk.net/fullchain; - ssl_certificate_key /var/lib/acme/live/luebeck.freifunk.net/privkey; + include snippets/acme.conf; + include snippets/tls.conf; - root /var/www/wiki; + ssl_certificate /var/lib/acme/live/luebeck.freifunk.net/fullchain; + ssl_certificate_key /var/lib/acme/live/luebeck.freifunk.net/privkey; + + root /var/www/wiki; + + location / { + proxy_pass https://freifunk-luebeck.pages.chaotikum.org/wiki/; + proxy_set_header Host freifunk-luebeck.pages.chaotikum.org; + } }