nginx: adjust expiration date for static content.

3 files changed, 6 insertions, 0 deletions

diff --git a/roles/git/files/etc/nginx/sites-available/git b/roles/git/files/etc/nginx/sites-available/git
index 75c1512..112babb 100644
--- a/roles/git/files/etc/nginx/sites-available/git
+++ b/roles/git/files/etc/nginx/sites-available/git
@@ -1,40 +1,41 @@
 server {
     listen      80;
     listen [::]:80;
 
     server_name  git.fripost.org;
 
     access_log /var/log/nginx/git.access.log;
     error_log  /var/log/nginx/git.error.log info;
 
     location ^~ /static/ {
         alias /usr/share/cgit/;
         expires 30d;
     }
 
     # Bypass the CGI to return static files stored on disk. Try first repo with
     # a trailing '.git', then without.
     location ~* "^/((?U)[^/]+)(?:\.git)?/objects/(?:[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(?:pack|idx))$" {
         root /var/lib/gitolite/repositories;
         try_files /$1.git/objects/$2 /$1/objects/$2 =404;
         expires 30d;
+        gzip off;
         # TODO honor git-daemon-export-ok
     }
 
     # disallow push over HTTP/HTTPS
     location ~* "^/[^/]+/git-receive-pack$" { return 403; }
 
     location ~* "^/[^/]+/(?:HEAD|info/refs|objects/info/[^/]+|git-upload-pack)$" {
         gzip off;
         include uwsgi_params;
         uwsgi_modifier1 9;
         uwsgi_param GIT_PROJECT_ROOT /var/lib/gitolite/repositories;
         uwsgi_pass unix:/run/uwsgi/app/git-http-backend/socket;
     }
 
 
     # send all other URLs to cgit
     location / {
         gzip off;
         include uwsgi_params;
         uwsgi_modifier1 9;
@@ -50,40 +51,41 @@ server {
     server_name  git.fripost.org;
 
     include ssl/config;
     ssl_certificate     /etc/nginx/ssl/git.fripost.org.pem;
     ssl_certificate_key /etc/nginx/ssl/git.fripost.org.key;
 
     access_log /var/log/nginx/git.access.log;
     error_log  /var/log/nginx/git.error.log info;
 
     location ^~ /static/ {
         alias /usr/share/cgit/;
         expires 30d;
     }
 
     # Bypass the CGI to return static files stored on disk. Try first repo with
     # a trailing '.git', then without.
     location ~* "^/((?U)[^/]+)(?:\.git)?/objects/(?:[0-9a-f]{2}/[0-9a-f]{38}|pack/pack-[0-9a-f]{40}\.(?:pack|idx))$" {
         root /var/lib/gitolite/repositories;
         try_files /$1.git/objects/$2 /$1/objects/$2 =404;
         expires 30d;
+        gzip off;
         # TODO honor git-daemon-export-ok
     }
 
     # disallow push over HTTP/HTTPS
     location ~* "^/[^/]+/git-receive-pack$" { return 403; }
 
     location ~* "^/[^/]+/(?:HEAD|info/refs|objects/info/[^/]+|git-upload-pack)$" {
         gzip off;
         include uwsgi_params;
         uwsgi_modifier1 9;
         uwsgi_param GIT_PROJECT_ROOT /var/lib/gitolite/repositories;
         uwsgi_pass unix:/run/uwsgi/app/git-http-backend/socket;
     }
 
 
     # send all other URLs to cgit
     location / {
         gzip off;
         include uwsgi_params;
         uwsgi_modifier1 9;
diff --git a/roles/lists/files/etc/nginx/sites-available/sympa b/roles/lists/files/etc/nginx/sites-available/sympa
index fa3cad1..77e9dc0 100644
--- a/roles/lists/files/etc/nginx/sites-available/sympa
+++ b/roles/lists/files/etc/nginx/sites-available/sympa
@@ -13,40 +13,41 @@ server {
 
 server {
     listen      443;
     listen [::]:443 ipv6only=on;
 
     server_name  lists.fripost.org;
 
     access_log /var/log/nginx/lists.access.log;
     error_log  /var/log/nginx/lists.error.log info;
 
     include ssl/config;
     ssl_certificate     /etc/nginx/ssl/lists.fripost.org.pem;
     ssl_certificate_key /etc/nginx/ssl/lists.fripost.org.key;
 
     location = / {
         return 302 /sympa$args;
     }
 
     location ^~ /static-sympa/ {
         alias /var/lib/sympa/static_content/;
+        expires 30d;
     }
 
     location ^~ /sympa {
         fastcgi_split_path_info ^(/sympa)(.*)$;
         include fastcgi/params;
        
         fastcgi_pass unix:/run/wwsympa.socket;
         gzip off;
     }
 
     location ~* ^/([^/]+)/?$ {
         return 302 /$1/sympa$args;
     }
     location ~* ^/([^/]+)/sympa(/.*)?$ {
         set $vhost $1;
 
         if (!-f /etc/sympa/$vhost/robot.conf) {
             return 404;
         }
 
diff --git a/roles/wiki/files/etc/nginx/sites-available/website b/roles/wiki/files/etc/nginx/sites-available/website
index 3513510..ba8a34f 100644
--- a/roles/wiki/files/etc/nginx/sites-available/website
+++ b/roles/wiki/files/etc/nginx/sites-available/website
@@ -18,35 +18,38 @@ server {
 
     server_name 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/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/;
+        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;
     }
 }