summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Hands <phil@hands.com>2016-03-10 09:41:40 +0000
committerHolger Levsen <holger@layer-acht.org>2016-04-28 21:52:10 +0200
commitc382ec10d36aa661ebc8e997ffd755dfe8c2aac7 (patch)
tree343048c02d44146e37def962013a26015faa7ca2
parentcbfb6a03cb32f6bcc7fd0c062fa39da85f278a83 (diff)
downloadjenkins.debian.net-c382ec10d36aa661ebc8e997ffd755dfe8c2aac7.tar.xz
stop mail going out from jenkins-test-vm
-rw-r--r--hosts/jenkins-test-vm/etc/postfix/canonical-redirect1
-rw-r--r--hosts/jenkins-test-vm/etc/postfix/main.cf1
-rwxr-xr-xupdate_jdn.sh5
3 files changed, 6 insertions, 1 deletions
diff --git a/hosts/jenkins-test-vm/etc/postfix/canonical-redirect b/hosts/jenkins-test-vm/etc/postfix/canonical-redirect
new file mode 100644
index 00000000..9dd35a1d
--- /dev/null
+++ b/hosts/jenkins-test-vm/etc/postfix/canonical-redirect
@@ -0,0 +1 @@
+/^.*$/ phil
diff --git a/hosts/jenkins-test-vm/etc/postfix/main.cf b/hosts/jenkins-test-vm/etc/postfix/main.cf
index 6ee27f16..4c9dbae4 100644
--- a/hosts/jenkins-test-vm/etc/postfix/main.cf
+++ b/hosts/jenkins-test-vm/etc/postfix/main.cf
@@ -43,3 +43,4 @@ mailbox_command = /usr/bin/procmail -a "$EXTENSION"
luser_relay = phil@localhost
local_recipient_maps =
mydestination = pcre:/etc/postfix/mydestinations
+canonical_maps = regexp:/etc/postfix/canonical-redirect
diff --git a/update_jdn.sh b/update_jdn.sh
index 27293579..080d72e1 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -193,7 +193,10 @@ if [ -f /etc/debian_version ] ; then
zsh
"
case $HOSTNAME in
- jenkins|jenkins-test-vm|profitbricks-build*) DEBS="$DEBS squid3" ;;
+ jenkins|jenkins-test-vm|profitbricks-build?-amd64) DEBS="$DEBS
+ postfix-pcre
+ squid3"
+ ;;
*) ;;
esac
# needed to run the 2nd reproducible builds nodes in the future...