1 files changed, 29 insertions, 18 deletions

diff --git a/roles/wiki/files/etc/nginx/sites-available/website b/roles/wiki/files/etc/nginx/sites-available/website
index 3513510..4aeb3db 100644
--- a/roles/wiki/files/etc/nginx/sites-available/website
+++ b/roles/wiki/files/etc/nginx/sites-available/website
@@ -1,52 +1,63 @@
 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;
+    include /etc/lacme/nginx.conf;
 
-    return 301 https://fripost.org$request_uri;
+    access_log /var/log/nginx/www.access.log;
+    error_log  /var/log/nginx/www.error.log info;
+
+    location / {
+        return 301 https://$host$request_uri;
+    }
 }
 
 
 server {
-    listen      443;
-    listen [::]:443;
+    listen      443 ssl http2;
+    listen [::]:443 ssl http2;
 
-    server_name fripost.org;
+    server_name     fripost.org;
+    server_name www.fripost.org;
 
-    include ssl/config;
-    # 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/www.access.log;
+    error_log  /var/log/nginx/www.error.log info;
 
-    access_log /var/log/nginx/access.log;
-    error_log  /var/log/nginx/error.log info;
+    include snippets/headers.conf;
+    add_header Content-Security-Policy
+               "default-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; font-src 'self'; frame-ancestors 'none'; form-action https://www.paypal.com/; base-uri fripost.org www.fripost.org";
+
+    include snippets/ssl.conf;
+    ssl_certificate     ssl/www.fripost.org.pem;
+    ssl_certificate_key ssl/www.fripost.org.key;
+    include             snippets/fripost.org.hpkp-hdr;
+
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 256;
+    gzip_types application/font-woff application/font-woff2 application/javascript application/json application/xml image/svg+xml image/x-icon text/css text/plain;
 
     location / {
         try_files $uri $uri/ =404;
         index index.html;
         root /var/lib/ikiwiki/public_html/fripost-wiki/website;
     }
+    location = /ikiwiki.cgi { internal; }
     location /static/ {
+        expires 30d;
+        try_files $uri =404;
         alias /var/lib/ikiwiki/public_html/fripost-wiki/static/;
     }
     location /material/ {
         alias /var/www/fripost.org/material/;
     }
     location /minutes/ {
         alias /var/www/fripost.org/minutes/;
     }
     location /.well-known/autoconfig/ {
         alias /var/www/fripost.org/autoconfig/;
     }
-
-    location = /ikiwiki.cgi {
-        return 403;
-    }
 }