summaryrefslogtreecommitdiffstats
path: root/roles/lists
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2023-01-13 23:41:09 +0100
committerGuilhem Moulin <guilhem@fripost.org>2023-01-13 23:41:09 +0100
commit6db5440eebbd418d84428d360e17b52273f4d1d8 (patch)
tree3dd535e6db4cc94740c768562539a38cbc1fc9ab /roles/lists
parent7ea3baad594b889f6f7f4e7e4ccc4dc7c0099bc6 (diff)
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 .
Diffstat (limited to 'roles/lists')
-rw-r--r--roles/lists/files/etc/nginx/sites-available/sympa2
-rw-r--r--roles/lists/files/etc/sympa/sympa/sympa.conf6
-rw-r--r--roles/lists/templates/etc/sympa/robot.conf.j23
3 files changed, 6 insertions, 5 deletions
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
@@ -55,31 +55,31 @@ server {
location ~* ^/sympa(?:/|$) {
gzip off; # protect against BREACH
fastcgi_split_path_info ^(/sympa)(.*)$;
include snippets/fastcgi.conf;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_pass unix:/run/wwsympa.socket;
}
location ~* ^/([^/]+)/?$ {
return 302 /$1/sympa$args;
}
location ~* ^/(?<vhost>[^/]+)/sympa(?:/|$) {
gzip off; # protect against BREACH
if (!-f /etc/sympa/$vhost/robot.conf) {
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;
fastcgi_pass unix:/run/wwsympa.socket;
}
location / {
return 404;
}
}
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
@@ -31,41 +31,41 @@ 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 `/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
create_list intranet
###\\\\ Directories ////###
## Directory containing mailing lists subdirectories
home /var/lib/sympa/list_data
## Directory for configuration files; it also contains scenari/ and templates/ directories
etc /etc/sympa
###\\\\ System related ////###
## 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
log_level 0
## Communication mode with syslogd (unix | inet)
log_socket_type unix
## Umask used for file creation by Sympa
umask 027
###\\\\ Sending related ////###
## Path to the MTA (sendmail, postfix, exim or qmail)
## should point to a sendmail-compatible binary (eg: a binary named "sendmail" is distributed with Postfix)
sendmail /usr/sbin/sendmail
sendmail_aliases none
## Max. number of Sendmail processes (launched by Sympa) running simultaneously
## Proposed value is quite low, you can rise it up to 100, 200 or even 300 with powerfull systems.
@@ -347,49 +347,51 @@ cookie_refresh 60
#custom_archiver
## Type of main Web page ( lists | home )
default_home home
## Javascript excerpt that enables and configures the WYSIWYG HTML editor.
#html_editor_init
#htmlarea_url
## When using LDAP authentication, if the identifier provided by the user was
## a valid email, if this parameter is set to false, then the provided email
## will be used to authenticate the user. Otherwise, use of the first email
## returned by the LDAP server will be used.
ldap_force_canonical_email 1
#log_condition
## 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
## Path to MHonArc mail2html plugin
## This is required for HTML mail archiving
mhonarc /usr/bin/mhonarc
## Password case (insensitive | sensitive)
## Should not be changed ! May invalid all user password
password_case insensitive
## Default number of lines of the array displaying users in the review page
review_page_size 25
## Title of main Web page
title Mailing lists service
## If set to "on", users will be able to post messages in HTML using a
## javascript WYSIWYG editor.
use_html_editor 0
## Is fast_cgi module for Apache (or Roxen) installed (0 | 1)
## This module provide much faster web interface
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