From 039e5f203fd91f02586559694d97799b65e10726 Mon Sep 17 00:00:00 2001
From: Mark Longair <mhl@pobox.com>
Date: Tue, 5 Nov 2013 15:02:54 +0000
Subject: Rename /etc/postfix/regexp to /etc/postfix/transports

This seems slightly less confusing, since both this file
and /etc/postfix/recipients contain regexp patterns.  This
also switches to replacing any transport_maps file that was
in use and overwrites the existing file rather than modifying
it.
---
 script/site-specific-install.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'script/site-specific-install.sh')

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
index e5a6f3f0b..8917fd577 100755
--- a/script/site-specific-install.sh
+++ b/script/site-specific-install.sh
@@ -51,8 +51,8 @@ ensure_line_present \
     /etc/postfix/master.cf 644
 
 ensure_line_present \
-    "^ *transport_maps *= *regexp:/etc/postfix/regexp" \
-    "transport_maps = regexp:/etc/postfix/regexp" \
+    "^ *transport_maps *=" \
+    "transport_maps = regexp:/etc/postfix/transports" \
     /etc/postfix/main.cf 644
 
 ensure_line_present \
@@ -65,11 +65,6 @@ ensure_line_present \
     "mydestination = $HOST, $(hostname --fqdn), localhost.localdomain, localhost" \
     /etc/postfix/main.cf 644
 
-ensure_line_present \
-    "^.*alaveteli" \
-    "/^foi.*/	alaveteli" \
-    /etc/postfix/regexp 644
-
 ensure_line_present \
     "^do-not-reply" \
     "do-not-reply-to-this-address:        :blackhole:" \
@@ -80,6 +75,10 @@ ensure_line_present \
     "mail.*                          -/var/log/mail/mail.log" \
     /etc/rsyslog.d/50-default.conf 644
 
+cat > /etc/postfix/transports <<EOF
+/^foi.*/                alaveteli
+EOF
+
 cat > /etc/postfix/recipients <<EOF
 /^foi.*/                this-is-ignored
 /^postmaster@/          this-is-ignored
@@ -109,7 +108,7 @@ fi
 /etc/init.d/rsyslog restart
 
 newaliases
-postmap /etc/postfix/regexp
+postmap /etc/postfix/transports
 postmap /etc/postfix/recipients
 postfix reload
 
-- 
cgit v1.2.3