From 6db5440eebbd418d84428d360e17b52273f4d1d8 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 13 Jan 2023 23:41:09 +0100
Subject: Sympa: Update robot.conf to fix HTTP 421 on virtual hosts.

See https://github.com/sympa-community/sympa/issues/879 ,
https://www.sympa.community/manual/upgrade/notes.html#from-version-prior-to-6256 and
https://www.sympa.community/gpldoc/man/sympa_config.5.html#wwsympa_url_local .
---
 roles/lists/files/etc/nginx/sites-available/sympa | 2 +-
 roles/lists/files/etc/sympa/sympa/sympa.conf      | 6 ++++--
 roles/lists/templates/etc/sympa/robot.conf.j2     | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'roles')

diff --git a/roles/lists/files/etc/nginx/sites-available/sympa b/roles/lists/files/etc/nginx/sites-available/sympa
index 89d79f3..8ac6bb4 100644
--- a/roles/lists/files/etc/nginx/sites-available/sympa
+++ b/roles/lists/files/etc/nginx/sites-available/sympa
@@ -72,7 +72,7 @@ server {
             return 404;
         }
 
-        fastcgi_split_path_info ^(/[^/]+/sympa)(.*)$;
+        fastcgi_split_path_info ^/[^/]+(/sympa)(.*)$;
         include snippets/fastcgi.conf;
         fastcgi_param PATH_INFO $fastcgi_path_info;
         fastcgi_param SERVER_NAME $vhost;
diff --git a/roles/lists/files/etc/sympa/sympa/sympa.conf b/roles/lists/files/etc/sympa/sympa/sympa.conf
index 75072cf..7d29173 100644
--- a/roles/lists/files/etc/sympa/sympa/sympa.conf
+++ b/roles/lists/files/etc/sympa/sympa/sympa.conf
@@ -48,7 +48,7 @@ etc	/etc/sympa
 
 ## Syslog facility for sympa
 ## Do not forget to edit syslog.conf
-syslog `cat /etc/sympa/facility`
+syslog LOCAL1
 
 ## Log verbosity
 ## 0: normal, 2,3,4: for debug
@@ -364,7 +364,7 @@ ldap_force_canonical_email	1
 
 ## Syslog facility for wwsympa, archived and bounced
 ## Default is to use previously defined sympa log facility.
-log_facility	`cat /etc/sympa/facility`
+log_facility	LOCAL1
 
 #log_module
 
@@ -393,3 +393,5 @@ use_fast_cgi	1
 ## Default number of lines of the array displaying the log entries in the logs
 ## page
 viewlogs_page_size	25
+
+shared_feature on
diff --git a/roles/lists/templates/etc/sympa/robot.conf.j2 b/roles/lists/templates/etc/sympa/robot.conf.j2
index 75687d8..28998e3 100644
--- a/roles/lists/templates/etc/sympa/robot.conf.j2
+++ b/roles/lists/templates/etc/sympa/robot.conf.j2
@@ -1,3 +1,2 @@
-http_host   {{ item }}
+#wwsympa_url_local https://{{ item }}/sympa
 wwsympa_url https://{{ item }}/sympa
-# wwsympa_url https://lists.fripost.org/{{ item }}/sympa
-- 
cgit v1.2.3