Modifications : etc/sv/postfix/local.sh

[lhc/ateliers.git] / etc / sv / postfix / local.sh

diff --git a/etc/sv/postfix/local.sh b/etc/sv/postfix/local.sh
index 8d6230d..1023ab9 100644 (file)
--- a/etc/sv/postfix/local.sh
+++ b/etc/sv/postfix/local.sh
@@ -1,10 +1,10 @@
-sudo test -f /etc/postfix/$local_domainname/smtpd/x509/key.pem ||
-printf '%s\n' "$(tput rev)run before: remote/runit-configure dovecot$(tput sgr0)" && exit 1
+hint="run before: remote/runit-configure $sv"
+assert 'sudo test -f /etc/postfix/$local_domainname/smtpd/x509/key.pem' hint
 
 sudo debconf-set-selections <<-EOF
        postfix postfix/main_mailer_type        select  No configuration
        EOF
-"$tool"/local/apt-get-install postfix procmail postfix-pcre
+"$tool"/local/apt-get-install postfix procmail postfix-pcre postfix-policyd-spf-perl
 "$tool"/local/insserv-remove  postfix
 
 sudo install -m 640 -o root -g root /dev/stdin /etc/postfix/.gitignore <<-EOF
@@ -81,10 +81,13 @@ sudo install -m 640 -o root -g root \
  "$tool"/etc/postfix/$local_domainname/transport \
         /etc/postfix/$local_domainname/transport
 sudo postmap hash:/etc/postfix/$local_domainname/transport
-sudo install -m 640 -o root -g root \
- "$tool"/etc/postfix/$local_domainname/virtual_alias \
-        /etc/postfix/$local_domainname/virtual_alias
+sudo postmap hash:/etc/postfix/ptitvelo.net/transport-pending-transition-from-lautrenet
+       # TODO: supprimer ce transport à la migration des MX de lautre.net à ici.
 sudo postmap hash:/etc/postfix/$local_domainname/virtual_alias
+sudo postmap hash:/etc/postfix/cyclocoop.org/virtual_alias
+sudo postmap hash:/etc/postfix/ptitvelo.net/virtual_alias
+sudo postmap hash:/etc/postfix/ptitvelo.net/virtual_alias-pending-transition-from-lautrenet
+       # TODO: supprimer ce virtual_alias à la migration des MX de lautre.net à ici.
 sudo install -d -m 770 -o root -g root \
  /etc/skel/etc/mail \
  /etc/skel/var/cache/mail \