git, wiki, website: Improve gzip support.

3 files changed, 19 insertions, 10 deletions

diff --git a/roles/git/files/etc/nginx/sites-available/git b/roles/git/files/etc/nginx/sites-available/git
index 7ad765f..0aa4345 100644
--- a/roles/git/files/etc/nginx/sites-available/git
+++ b/roles/git/files/etc/nginx/sites-available/git
@@ -16,57 +16,62 @@ server {
 
 
 server {
     listen      443 ssl http2;
     listen [::]:443 ssl http2;
 
     server_name  git.fripost.org;
 
     access_log /var/log/nginx/git.access.log;
     error_log  /var/log/nginx/git.error.log info;
 
     include snippets/headers.conf;
     add_header Content-Security-Policy
                "default-src 'none'; img-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self'";
 
     include snippets/ssl.conf;
     ssl_certificate     ssl/git.fripost.org.pem;
     ssl_certificate_key ssl/git.fripost.org.key;
     include             snippets/git.fripost.org.hpkp-hdr;
 
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 256;
+    gzip_types application/javascript application/json application/xml image/svg+xml image/x-icon text/css text/plain;
+
     location ^~ /static/ {
         alias /usr/share/cgit/;
-        expires 30d;
     }
 
     # disallow push over HTTP/HTTPS
     location ~ "^/.+/git-receive-pack$" { return 403; }
 
     location ~ "^/.+/(?:info/refs|git-upload-pack)$" {
         limit_except GET POST { deny all; }
         fastcgi_buffering off;
         gzip off;
 
         fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend;
         fastcgi_param NO_BUFFERING    "";
 
         # cf. git-http-backend(1)
         fastcgi_param GIT_PROJECT_ROOT /var/lib/gitolite/repositories;
         fastcgi_param PATH_INFO        $uri;
         fastcgi_param CONTENT_TYPE     $content_type;
         fastcgi_param QUERY_STRING     $query_string;
         fastcgi_param REQUEST_METHOD   $request_method;
         fastcgi_pass unix:/run/git-http-backend.socket;
     }
 
+    location = /robots.txt  { root /usr/share/cgit; }
+    location = /favicon.ico { root /usr/share/cgit; }
 
     # send all other URLs to cgit
     location / {
-        gzip off;
         fastcgi_param SCRIPT_FILENAME  /usr/lib/cgit/cgit.cgi;
         fastcgi_param PATH_INFO        $uri;
         fastcgi_param CONTENT_TYPE     $content_type;
         fastcgi_param QUERY_STRING     $query_string;
         fastcgi_param REQUEST_METHOD   $request_method;
         fastcgi_pass unix:/run/cgit.socket;
     }
 }
diff --git a/roles/wiki/files/etc/nginx/sites-available/website b/roles/wiki/files/etc/nginx/sites-available/website
index c524800..cd6832a 100644
--- a/roles/wiki/files/etc/nginx/sites-available/website
+++ b/roles/wiki/files/etc/nginx/sites-available/website
@@ -18,45 +18,44 @@ server {
 
 server {
     listen      443 ssl http2;
     listen [::]:443 ssl http2;
 
     server_name     fripost.org;
     server_name www.fripost.org;
 
     access_log /var/log/nginx/www.access.log;
     error_log  /var/log/nginx/www.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'; 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/ {
         alias /var/lib/ikiwiki/public_html/fripost-wiki/static/;
-        expires 30d;
     }
     location /material/ {
         alias /var/www/fripost.org/material/;
-        expires 30d;
     }
     location /minutes/ {
         alias /var/www/fripost.org/minutes/;
-        expires 30d;
     }
     location /.well-known/autoconfig/ {
         alias /var/www/fripost.org/autoconfig/;
     }
-
-    location = /ikiwiki.cgi {
-        return 403;
-    }
 }
diff --git a/roles/wiki/files/etc/nginx/sites-available/wiki b/roles/wiki/files/etc/nginx/sites-available/wiki
index 4b62d54..89e86d8 100644
--- a/roles/wiki/files/etc/nginx/sites-available/wiki
+++ b/roles/wiki/files/etc/nginx/sites-available/wiki
@@ -17,36 +17,41 @@ server {
 
 
 server {
     listen      443 ssl http2;
     listen [::]:443 ssl http2;
 
     server_name wiki.fripost.org;
 
     access_log /var/log/nginx/wiki.access.log;
     error_log  /var/log/nginx/wiki.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'; font-src 'self'; frame-ancestors 'none'; form-action 'self'; base-uri wiki.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 / {
         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;
         include snippets/fastcgi.conf;
         fastcgi_pass unix:/run/ikiwiki.socket;
-        gzip off;
+        gzip off; # protect against BREACH
     }
 }