Modifications : etc/sv/dovecot

diff --git a/etc/dovecot/dovecot.conf.m4 b/etc/dovecot/dovecot.conf.m4
index 425df3f..bbfd517 100644 (file)
--- a/etc/dovecot/dovecot.conf.m4
+++ b/etc/dovecot/dovecot.conf.m4
@@ -20,6 +20,11 @@ local_name imap.cyclocoop.org {
        ssl_cert = </etc/dovecot/cyclocoop.org/imap/x509/crt+crl.self-signed.pem
        ssl_key  = </etc/dovecot/cyclocoop.org/imap/x509/key.pem
  }
+local_name imap.ptitvelo.net {
+       ssl_ca   = </etc/dovecot/ptitvelo.net/imap/x509/crt+crl.self-signed.pem
+       ssl_cert = </etc/dovecot/ptitvelo.net/imap/x509/crt+crl.self-signed.pem
+       ssl_key  = </etc/dovecot/ptitvelo.net/imap/x509/key.pem
+ }
 local_name pop.LOCAL_DOMAINNAME {
        ssl_ca   = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/crt+crl.self-signed.pem
        ssl_cert = </etc/dovecot/LOCAL_DOMAINNAME/pop/x509/crt+crl.self-signed.pem
@@ -30,6 +35,11 @@ local_name pop.cyclocoop.org {
        ssl_cert = </etc/dovecot/cyclocoop.org/pop/x509/crt+crl.self-signed.pem
        ssl_key  = </etc/dovecot/cyclocoop.org/pop/x509/key.pem
  }
+local_name pop.ptitvelo.net {
+       ssl_ca   = </etc/dovecot/ptitvelo.net/pop/x509/crt+crl.self-signed.pem
+       ssl_cert = </etc/dovecot/ptitvelo.net/pop/x509/crt+crl.self-signed.pem
+       ssl_key  = </etc/dovecot/ptitvelo.net/pop/x509/key.pem
+ }
 mail_debug = yes
 mail_home = /home/mail/data/%d/%n
 mail_location = maildir:/home/mail/data/%d/%n/Maildir:INDEX=/var/lib/dovecot-index/%d/%n:CONTROL=/var/lib/dovecot-control/%d/%n

diff --git a/etc/dovecot/sieve/global.d/list.sieve b/etc/dovecot/sieve/global.d/list.sieve
index 39f5ce5..cdc19f9 100644 (file)
--- a/etc/dovecot/sieve/global.d/list.sieve
+++ b/etc/dovecot/sieve/global.d/list.sieve
@@ -21,6 +21,14 @@ if exists "List-ID" {
                set "list"   "${2}";
                set "domain" "cyclocoop";
         }
+       elsif header :matches "List-ID" "*<*.*.ptitvelo.net>*" {
+               set "list"   "${2}+${3}";
+               set "domain" "ptitvelo";
+        }
+       elsif header :matches "List-ID" "*<*.ptitvelo.net>*" {
+               set "list"   "${2}";
+               set "domain" "ptitvelo";
+        }
        elsif header :matches "List-ID" "*<*.*.*.*>*" {
                set "list"   "${2}";
                set "domain" "${4}";

diff --git a/etc/dovecot/transport b/etc/dovecot/transport
index 073f0e9..2692be6 100644 (file)
--- a/etc/dovecot/transport
+++ b/etc/dovecot/transport
@@ -1,2 +1,3 @@
 dovecot.heureux-cyclage.org lmtp:unix:private/dovecot-lmtp
 dovecot.cyclocoop.org       lmtp:unix:private/dovecot-lmtp
+dovecot.ptitvelo.net        lmtp:unix:private/dovecot-lmtp

diff --git a/etc/nsd3/zone.d/ptitvelo.net.zone.m4 b/etc/nsd3/zone.d/ptitvelo.net.zone.m4
index 93d89f5..20b4009 100644 (file)
--- a/etc/nsd3/zone.d/ptitvelo.net.zone.m4
+++ b/etc/nsd3/zone.d/ptitvelo.net.zone.m4
@@ -41,10 +41,12 @@ imap                 A IP4(GRESILLE)
 mail                 A IP4(LAUTRENET)
 mx                   A IP4(GRESILLE)
 ns                   A IP4(GRESILLE)
-www.questionnaires       A IP4(LAUTRENET)
+pop                  A IP4(GRESILLE)
+roundcube            A IP4(GRESILLE)
 smtp                 A IP4(GRESILLE)
 sympa                A IP4(GRESILLE)
 www                  A IP4(LAUTRENET)
+www.questionnaires       A IP4(LAUTRENET)
 
 ; ENREGISTREMENTS « CNAME » (Canonical NAME)
 ; NOTE : l'utilisation de CNAME n'est judicieuse que si la ressource pointée

diff --git a/etc/openssl/roundcube.heureux-cyclage.org/host.cfg b/etc/openssl/roundcube.heureux-cyclage.org/host.cfg
index 3b54e5b..e275b0b 100644 (file)
--- a/etc/openssl/roundcube.heureux-cyclage.org/host.cfg
+++ b/etc/openssl/roundcube.heureux-cyclage.org/host.cfg
@@ -27,7 +27,7 @@
 [ extensions ]
        basicConstraints       = critical,CA:TRUE,pathlen:0
        keyUsage               = keyCertSign,cRLSign,digitalSignature,keyEncipherment
-       subjectAltName         = email:contact+$SERVICE@$ENV::x509_host,DNS:mail.$ENV::x509_host,DNS:courriel.$ENV::x509_host,DNS:$SERVICE.cyclocoop.org,DNS:mail.cyclocoop.org,DNS:courriel.cyclocoop.org
+       subjectAltName         = email:contact+$SERVICE@$ENV::x509_host,DNS:mail.$ENV::x509_host,DNS:courriel.$ENV::x509_host,DNS:$SERVICE.cyclocoop.org,DNS:mail.cyclocoop.org,DNS:courriel.cyclocoop.org,DNS:$SERVICE.ptitvelo.net,DNS:mail.ptitvelo.net,DNS:courriel.ptitvelo.net
        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:mail.$ENV::x509_host,DNS:courriel.$ENV::x509_host,DNS:$SERVICE.cyclocoop.org,DNS:mail.cyclocoop.org,DNS:courriel.cyclocoop.org
+       subjectAltName         = email:contact+$SERVICE@$ENV::x509_host,DNS:mail.$ENV::x509_host,DNS:courriel.$ENV::x509_host,DNS:$SERVICE.cyclocoop.org,DNS:mail.cyclocoop.org,DNS:courriel.cyclocoop.org,DNS:$SERVICE.ptitvelo.net,DNS:mail.ptitvelo.net,DNS:courriel.ptitvelo.net
        subjectKeyIdentifier   = hash
        issuerAltName          = issuer:copy
        authorityKeyIdentifier = keyid:always,issuer:always

diff --git a/etc/sv/dovecot/local.sh b/etc/sv/dovecot/local.sh
index f5d2a05..f8fbf1c 100644 (file)
--- a/etc/sv/dovecot/local.sh
+++ b/etc/sv/dovecot/local.sh
@@ -4,7 +4,8 @@
 hint="run before: remote/runit-configure $sv"
 for domain in \
  "$local_domainname" \
- cyclocoop.org
+ cyclocoop.org \
+ ptitvelo.net
  do
        for protocol in imap pop
         do

diff --git a/etc/sv/dovecot/remote.sh b/etc/sv/dovecot/remote.sh
index 36d975a..0aed089 100644 (file)
--- a/etc/sv/dovecot/remote.sh
+++ b/etc/sv/dovecot/remote.sh
@@ -1,6 +1,7 @@
 for domain in \
  "$local_domainname" \
- cyclocoop.org
+ cyclocoop.org \
+ ptitvelo.net
  do
        for protocol in imap pop
         do

diff --git a/etc/sv/dovecot/transport b/etc/sv/dovecot/transport
index ea21a09..0e279dc 100644 (file)
--- a/etc/sv/dovecot/transport
+++ b/etc/sv/dovecot/transport
@@ -1 +1,2 @@
 dovecot.cyclocoop.org lmtp:unix:private/dovecot-lmtp
+dovecot.ptitvelo.net  lmtp:unix:private/dovecot-lmtp

diff --git a/etc/sv/postfix/local.sh b/etc/sv/postfix/local.sh
index 1b6bf31..85e0436 100644 (file)
--- a/etc/sv/postfix/local.sh
+++ b/etc/sv/postfix/local.sh
@@ -87,6 +87,7 @@ sudo postmap hash:/etc/postfix/$local_domainname/virtual_alias
 sudo postmap hash:/etc/postfix/$local_domainname/virtual_alias-pending-transition-from-lautrenet
        # TODO: supprimer ce virtual_alias à la migration des MX de lautre.net à ici.
 sudo postmap hash:/etc/postfix/cyclocoop.org/virtual_alias
+sudo postmap hash:/etc/postfix/ptitvelo.net/virtual_alias
 sudo install -d -m 770 -o root -g root \
  /etc/skel/etc/mail \
  /etc/skel/var/cache/mail \