Modifications : etc/nginx/site.d/sympa/http.conf

diff --git a/etc/gitolite b/etc/gitolite
index 318666e..768128e 160000 (submodule)
--- a/etc/gitolite
+++ b/etc/gitolite
@@ -1 +1 @@
-Subproject commit 318666e8101ce45320e34c0b8e50409f379142c7
+Subproject commit 768128e3f8ad748d5b5a2a7fbe4b136b59e27cd3

diff --git a/etc/nginx/site.d/sympa/http.conf b/etc/nginx/site.d/sympa/http.conf
index abd6f8a..27d799b 100644 (file)
--- a/etc/nginx/site.d/sympa/http.conf
+++ b/etc/nginx/site.d/sympa/http.conf
@@ -1,5 +1,6 @@
 server {
        listen 80;
+       include /etc/nginx/conf.d/letsencrypt.conf;
        server_name
         sympa.heureux-cyclage.org
         sympa.chatperche.heureux-cyclage.org

diff --git a/etc/nginx/site.d/sympa/local.conf b/etc/nginx/site.d/sympa/local.conf
index 1b1edf0..2a98298 100644 (file)
--- a/etc/nginx/site.d/sympa/local.conf
+++ b/etc/nginx/site.d/sympa/local.conf
@@ -1,5 +1,4 @@
 listen 443;
-include /etc/nginx/conf.d/ssl.conf;
-ssl_certificate     /etc/nginx/x509.d/sympa/crt.pem;
-ssl_certificate_key /etc/nginx/x509.d/sympa/key.pem;
-ssl_session_timeout 5m;
+include /etc/nginx/conf.d/ssl-pfs.conf;
+ssl_certificate     /etc/nginx/org/heureux-cyclage/crt.pem;
+ssl_certificate_key /etc/nginx/org/heureux-cyclage/key.pem;

diff --git a/etc/nsd/zone.d/heureux-cyclage.org.zone.m4 b/etc/nsd/zone.d/heureux-cyclage.org.zone.m4
index 17cdf36..110f537 100644 (file)
--- a/etc/nsd/zone.d/heureux-cyclage.org.zone.m4
+++ b/etc/nsd/zone.d/heureux-cyclage.org.zone.m4
@@ -106,6 +106,7 @@ smtp                 A IP4(GRESILLE)
 stats                A IP4(GRESILLE)
 submission           A IP4(GRESILLE)
 sympa                A IP4(GRESILLE)
+sympa.chatperche     A IP4(GRESILLE)
 sympa.cyclocoop      A IP4(GRESILLE)
 sympa.lesjantesdunord A IP4(GRESILLE)
 sympa.ptitvelo       A IP4(GRESILLE)

diff --git a/etc/openssl/sympa.heureux-cyclage.org/host.cfg b/etc/openssl/sympa.heureux-cyclage.org/host.cfg
index dc744bd..d458023 100644 (file)
--- a/etc/openssl/sympa.heureux-cyclage.org/host.cfg
+++ b/etc/openssl/sympa.heureux-cyclage.org/host.cfg
@@ -27,7 +27,7 @@
 [ extensions ]
        basicConstraints       = critical,CA:FALSE,pathlen:0
        keyUsage               = keyEncipherment
-       subjectAltName         = email:contact+$SERVICE@$ENV::x509_host,DNS:$SERVICE.$ENV::x509_host,DNS:$SERVICE.cyclocoop.org,DNS:$SERVICE.cyclocoop.heureux-cyclage.org,DNS:$SERVICE.lesjantesdunord.org,DNS:$SERVICE.lesjantesdunord.heureux-cyclage.org,DNS:$SERVICE.ptitvelo.net,DNS:$SERVICE.ptitvelo.heureux-cyclage.org
+       subjectAltName         = email:contact+$SERVICE@$ENV::x509_host,DNS:$SERVICE.$ENV::x509_host,DNS:$SERVICE.chatperche.org,DNS:$SERVICE.chatperche.heureux-cyclage.org,DNS:$SERVICE.cyclocoop.org,DNS:$SERVICE.cyclocoop.heureux-cyclage.org,DNS:$SERVICE.lesjantesdunord.org,DNS:$SERVICE.lesjantesdunord.heureux-cyclage.org,DNS:$SERVICE.ptitvelo.net,DNS:$SERVICE.ptitvelo.heureux-cyclage.org
        subjectKeyIdentifier   = hash
        issuerAltName          = issuer:copy
        authorityKeyIdentifier = keyid:always,issuer:always
@@ -37,7 +37,7 @@
 [ self_signed_extensions ]
        basicConstraints       = critical,CA:TRUE,pathlen:0
        keyUsage               = keyCertSign,cRLSign,digitalSignature,keyEncipherment
-       subjectAltName         = email:contact+$SERVICE@$ENV::x509_host,DNS:$SERVICE.$ENV::x509_host,DNS:$SERVICE.cyclocoop.org,DNS:$SERVICE.cyclocoop.heureux-cyclage.org,DNS:$SERVICE.lesjantesdunord.org,DNS.$SERVICE.lesjantesdunord.heureux-cyclage.org,DNS:$SERVICE.ptitvelo.net,DNS:$SERVICE.ptitvelo.heureux-cyclage.org
+       subjectAltName         = email:contact+$SERVICE@$ENV::x509_host,DNS:$SERVICE.$ENV::x509_host,DNS:$SERVICE.chatperche.org,DNS:$SERVICE.chatperche.heureux-cyclage.org,DNS:$SERVICE.cyclocoop.org,DNS:$SERVICE.cyclocoop.heureux-cyclage.org,DNS:$SERVICE.lesjantesdunord.org,DNS.$SERVICE.lesjantesdunord.heureux-cyclage.org,DNS:$SERVICE.ptitvelo.net,DNS:$SERVICE.ptitvelo.heureux-cyclage.org
        subjectKeyIdentifier   = hash
        issuerAltName          = issuer:copy
        authorityKeyIdentifier = keyid:always,issuer:always

diff --git a/etc/postfix/aliases.m4 b/etc/postfix/aliases.m4
index 54c10ae..ad8353b 100644 (file)
--- a/etc/postfix/aliases.m4
+++ b/etc/postfix/aliases.m4
@@ -26,6 +26,19 @@ listserv:          sympa
 majordomo:         sympa
 #-- SYMPA heureux-cyclage.org end
 
+#-- SYMPA chatperche.org begin
+chatperche.org-abuse-feedback-report: "| /usr/lib/sympa/bin/bouncequeue sympa@chatperche.org"
+chatperche.org-abuse:                 "| /usr/lib/sympa/bin/bouncequeue sympa@chatperche.org"
+chatperche.org-bounce+*:              "| /usr/lib/sympa/bin/bouncequeue sympa@chatperche.org"
+chatperche.org-listmaster:            "| /usr/lib/sympa/bin/queue  listmaster@chatperche.org"
+chatperche.org-postmaster:    postmaster
+chatperche.org-admin:         admin
+chatperche.org-root:          root
+chatperche.org-sympa-owner:   postmaster
+chatperche.org-sympa-request: postmaster
+chatperche.org-sympa:                 "| /usr/lib/sympa/bin/queue       sympa@chatperche.org"
+#-- SYMPA chatperche.org end
+
 #-- SYMPA cyclocoop.org begin
 cyclocoop.org-abuse-feedback-report: "| /usr/lib/sympa/bin/bouncequeue sympa@cyclocoop.org"
 cyclocoop.org-abuse:                 "| /usr/lib/sympa/bin/bouncequeue sympa@cyclocoop.org"

diff --git a/etc/sympa/host.d/chatperche.org/robot.conf.m4 b/etc/sympa/host.d/chatperche.org/robot.conf.m4
new file mode 100644 (file)
index 0000000..5d1e4fa
--- /dev/null
+++ b/etc/sympa/host.d/chatperche.org/robot.conf.m4
@@ -0,0 +1,4 @@
+http_host           sympa.HOST
+listmaster quentin@chatperche.org, ludovic.chevalier@heureux-cyclage.org
+logo_html_definition <img alt="SYMPA logo" src="/static-sympa/icons/chatperche.org/logo_sympa.png" style="float: left;">
+wwsympa_url https://sympa.HOST

diff --git a/etc/sympa/virtual_alias b/etc/sympa/virtual_alias
index f55ec24..6ccf1cd 100644 (file)
--- a/etc/sympa/virtual_alias
+++ b/etc/sympa/virtual_alias
@@ -1,3 +1,4 @@
+/^([^@+]+)@(chatperche\.org)$/ $2-$1
 /^([^@+]+)@(cyclocoop\.org)$/ $2-$1
 /^([^@+]+)@(lesjantesdunord\.org)$/ $2-$1
 /^([^@+]+)@(ptitvelo\.net)$/ $2-$1