diff options
Diffstat (limited to 'roles/wiki')
-rw-r--r-- | roles/wiki/files/etc/nginx/sites-available/website | 2 | ||||
-rw-r--r-- | roles/wiki/files/etc/nginx/sites-available/wiki | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/wiki/files/etc/nginx/sites-available/website b/roles/wiki/files/etc/nginx/sites-available/website index 2a32212..7899f05 100644 --- a/roles/wiki/files/etc/nginx/sites-available/website +++ b/roles/wiki/files/etc/nginx/sites-available/website @@ -1,41 +1,41 @@ server { listen 80; listen [::]:80; server_name fripost.org; server_name www.fripost.org; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log info; return 301 https://fripost.org$request_uri; } server { listen 443; listen [::]:443; server_name fripost.org; - include conf.d/ssl; + include include.d/ssl; # include the intermediate certificate, see # - https://www.ssllabs.com/ssltest/analyze.html?d=fripost.org # - http://nginx.org/en/docs/http/configuring_https_servers.html ssl_certificate /etc/nginx/ssl/fripost.org.chained.pem; ssl_certificate_key /etc/nginx/ssl/fripost.org.key; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log info; location / { try_files $uri $uri/ =404; index index.html; root /var/lib/ikiwiki/public_html/fripost-wiki/website; } location /static/ { alias /var/lib/ikiwiki/public_html/fripost-wiki/static/; expires 30d; } location /material/ { alias /var/www/fripost.org/material/; diff --git a/roles/wiki/files/etc/nginx/sites-available/wiki b/roles/wiki/files/etc/nginx/sites-available/wiki index 8951633..a12b017 100644 --- a/roles/wiki/files/etc/nginx/sites-available/wiki +++ b/roles/wiki/files/etc/nginx/sites-available/wiki @@ -9,41 +9,41 @@ server { location / { location ~ ^/website(/.*)?$ { return 302 $scheme://fripost.org$1; } try_files $uri $uri/ =404; index index.html; root /var/lib/ikiwiki/public_html/fripost-wiki; } location = /ikiwiki.cgi { return 302 https://$host$request_uri; } } server { listen 443; listen [::]:443; server_name wiki.fripost.org; - include conf.d/ssl; + include include.d/ssl; # include the intermediate certificate, see # - https://www.ssllabs.com/ssltest/analyze.html?d=wiki.fripost.org # - http://nginx.org/en/docs/http/configuring_https_servers.html ssl_certificate /etc/nginx/ssl/fripost.org.chained.pem; ssl_certificate_key /etc/nginx/ssl/fripost.org.key; access_log /var/log/nginx/wiki.access.log; error_log /var/log/nginx/wiki.error.log info; location / { location ~ ^/website(/.*)?$ { return 302 $scheme://fripost.org$1; } try_files $uri $uri/ =404; index index.html; root /var/lib/ikiwiki/public_html/fripost-wiki; } location = /ikiwiki.cgi { fastcgi_param DOCUMENT_ROOT /var/lib/ikiwiki/public_html/fripost-wiki; fastcgi_param SCRIPT_FILENAME /var/lib/ikiwiki/public_html/ikiwiki.cgi; fastcgi_index ikiwiki.cgi; |