From 30c52c6fd758059604b44564384ae919940cf994 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sat, 16 May 2020 04:07:47 +0200
Subject: antilop: Upgrade baseline to Debian 10.

---
 roles/lists/files/etc/nginx/sites-available/sympa  | 34 ++++++++++++----------
 roles/lists/files/etc/sympa/sympa/sympa.conf       | 10 +++++--
 .../lists/files/etc/systemd/system/wwsympa.service |  9 +++---
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/roles/lists/files/etc/nginx/sites-available/sympa b/roles/lists/files/etc/nginx/sites-available/sympa
index f5a67bf..cdc2364 100644
--- a/roles/lists/files/etc/nginx/sites-available/sympa
+++ b/roles/lists/files/etc/nginx/sites-available/sympa
@@ -4,7 +4,7 @@ server {
 
     server_name lists.fripost.org;
 
-    include snippets/acme-challenge.conf;
+    include /etc/lacme/nginx.conf;
 
     access_log /var/log/nginx/lists.access.log;
     error_log  /var/log/nginx/lists.error.log info;
@@ -26,13 +26,19 @@ server {
 
     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'; upgrade-insecure-requests; block-all-mixed-content; reflected-xss block; referrer no-referrer-when-downgrade; frame-ancestors 'none'; form-action 'self'; base-uri lists.fripost.org";
+               "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 lists.fripost.org";
 
     include snippets/ssl.conf;
     ssl_certificate     ssl/lists.fripost.org.pem;
     ssl_certificate_key ssl/lists.fripost.org.key;
     include             snippets/lists.fripost.org.hpkp-hdr;
 
+    gzip on;
+    gzip_vary on;
+    gzip_min_length 256;
+    gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
+    gzip_types application/javascript application/json application/xml image/x-icon text/css text/plain;
+
     location = /robots.txt {
         allow all;
         log_not_found off;
@@ -44,24 +50,24 @@ server {
         return 302 /sympa$args;
     }
 
-    location ^~ /static-sympa/ {
-        alias /var/lib/sympa/static_content/;
-        expires 30d;
-    }
+    location ^~ /static-sympa/   { alias /usr/share/sympa/static_content/; }
+    location ^~ /css-sympa/      { alias /var/lib/sympa/css/; }
+    location ^~ /pictures-sympa/ { alias /var/lib/sympa/pictures; }
+
+    location ~* ^/sympa(?:/|$) {
+        gzip off;
 
-    location ^~ /sympa {
         fastcgi_split_path_info ^(/sympa)(.*)$;
         include snippets/fastcgi.conf;
-
+        fastcgi_param PATH_INFO $fastcgi_path_info;
         fastcgi_pass unix:/run/wwsympa.socket;
-        gzip off;
     }
 
     location ~* ^/([^/]+)/?$ {
         return 302 /$1/sympa$args;
     }
-    location ~* ^/([^/]+)/sympa(/.*)?$ {
-        set $vhost $1;
+    location ~* ^/(?<vhost>[^/]+)/sympa(?:/|$) {
+        gzip off;
 
         if (!-f /etc/sympa/$vhost/robot.conf) {
             return 404;
@@ -69,11 +75,9 @@ server {
 
         fastcgi_split_path_info ^(/[^/]+/sympa)(.*)$;
         include snippets/fastcgi.conf;
-
-        fastcgi_pass unix:/run/wwsympa.socket;
-        gzip off;
-
+        fastcgi_param PATH_INFO $fastcgi_path_info;
         fastcgi_param SERVER_NAME $vhost;
+        fastcgi_pass unix:/run/wwsympa.socket;
     }
 
     location / {
diff --git a/roles/lists/files/etc/sympa/sympa/sympa.conf b/roles/lists/files/etc/sympa/sympa/sympa.conf
index 0e88baf..94182cd 100644
--- a/roles/lists/files/etc/sympa/sympa/sympa.conf
+++ b/roles/lists/files/etc/sympa/sympa/sympa.conf
@@ -17,16 +17,20 @@ wwsympa_url	http://lists.fripost.org/sympa
 max_wrong_password	19
 
 ## Directory for storing static contents (CSS, members pictures, documentation) directly delivered by Apache
-static_content_path	/var/lib/sympa/static_content
+static_content_path	/usr/share/sympa/static_content
 
 ## URL mapped with the static_content_path directory defined above
 static_content_url	/static-sympa
 
-css_url /static-sympa/css
+css_url /css-sympa
+css_path	/var/lib/sympa/css
+
+pictures_path	/var/lib/sympa/pictures
+pictures_url	/pictures-sympa
 
 ## Secret used by Sympa to make MD5 fingerprint in web cookies secure
 ## Should not be changed ! May invalid all user password
-cookie	`head -n1 /etc/sympa/cookie`
+cookie	`/usr/bin/head -n1 /etc/sympa/cookie`
 
 ## Who is able to create lists
 ## This parameter is a scenario, check sympa documentation about scenarios if you want to define one
diff --git a/roles/lists/files/etc/systemd/system/wwsympa.service b/roles/lists/files/etc/systemd/system/wwsympa.service
index 3f76aca..1d302ef 100644
--- a/roles/lists/files/etc/systemd/system/wwsympa.service
+++ b/roles/lists/files/etc/systemd/system/wwsympa.service
@@ -12,16 +12,15 @@ ExecStart=/usr/lib/cgi-bin/sympa/wwsympa.fcgi
 
 # Hardening
 NoNewPrivileges=yes
-PrivateDevices=yes
-ProtectHome=yes
-ProtectSystem=strict
-PrivateTmp=yes
 ReadWriteDirectories=/etc/sympa
 ReadWriteDirectories=/var/lib/sympa
-ReadWriteDirectories=-/var/run/sympa
 ReadWriteDirectories=/var/spool/sympa
+RuntimeDirectory=sympa
 PrivateDevices=yes
 PrivateNetwork=yes
+ProtectHome=yes
+ProtectSystem=strict
+PrivateTmp=yes
 ProtectControlGroups=yes
 ProtectKernelModules=yes
 ProtectKernelTunables=yes
-- 
cgit v1.2.3