[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Debian armhf: replace opi2a with jtk1a, except for builder jobs

Mon Sep 19 13:09:25 UTC 2016

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 39421cde89372babc21c5813b68de9579a0409c7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Sep 19 15:08:50 2016 +0200

    reproducible Debian armhf: replace opi2a with jtk1a, except for builder jobs
---
 README                                             |  2 +-
 bin/common-functions.sh                            |  4 +-
 bin/jenkins_node_definitions.sh                    |  8 ++--
 deploy_everywhere                                  |  2 +-
 hosts/bbx15-armhf-rb/etc/pbuilderrc                |  4 +-
 hosts/bbx15-armhf-rb/etc/postfix/main.cf           |  2 +-
 hosts/bpi0-armhf-rb/etc/pbuilderrc                 |  4 +-
 hosts/bpi0-armhf-rb/etc/postfix/main.cf            |  2 +-
 hosts/cb3a-armhf-rb/etc/pbuilderrc                 |  4 +-
 hosts/cb3a-armhf-rb/etc/postfix/main.cf            |  2 +-
 hosts/cbxi4a-armhf-rb/etc/pbuilderrc               |  4 +-
 hosts/cbxi4a-armhf-rb/etc/postfix/main.cf          |  2 +-
 hosts/cbxi4b-armhf-rb/etc/pbuilderrc               |  4 +-
 hosts/cbxi4b-armhf-rb/etc/postfix/main.cf          |  2 +-
 hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc            |  4 +-
 hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf       |  2 +-
 hosts/ff2a-armhf-rb/etc/pbuilderrc                 |  4 +-
 hosts/ff2a-armhf-rb/etc/postfix/main.cf            |  2 +-
 hosts/ff2b-armhf-rb/etc/pbuilderrc                 |  4 +-
 hosts/ff2b-armhf-rb/etc/postfix/main.cf            |  2 +-
 hosts/ff4a-armhf-rb/etc/pbuilderrc                 |  4 +-
 hosts/ff4a-armhf-rb/etc/postfix/main.cf            |  2 +-
 hosts/hb0-armhf-rb/etc/pbuilderrc                  |  4 +-
 hosts/hb0-armhf-rb/etc/postfix/main.cf             |  2 +-
 hosts/jenkins-test-vm/etc/pbuilderrc               |  4 +-
 hosts/jenkins/etc/munin/munin.conf                 |  6 +--
 hosts/jenkins/etc/pbuilderrc                       |  4 +-
 hosts/jtk1a                                        |  1 +
 .../etc/apt/apt.conf.d/10no-package-descriptions   |  0
 .../etc/apt/apt.conf.d/80proxy                     |  0
 .../etc/apt/listchanges.conf                       |  0
 .../etc/apt/sources.list                           |  0
 .../etc/cron.d/dsa                                 |  0
 .../etc/munin/munin-node.conf                      |  2 +-
 .../etc/munin/plugin-conf.d/df                     |  0
 .../etc/munin/plugin-conf.d/diskstats              |  0
 .../etc/munin/plugin-conf.d/munin-node             |  0
 .../etc/munin/plugins/jenkins_reproducible_builds  |  0
 .../etc/pbuilder/rebuild-hooks/B01_cleanup         |  0
 .../etc/pbuilder/rebuild-hooks/C01_cleanup         |  0
 .../pbuilder/rebuild-hooks/D01_modify_environment  |  0
 .../etc/pbuilderrc                                 |  4 +-
 .../etc/postfix/main.cf                            |  6 +--
 .../etc/rc.local                                   |  0
 .../etc/schroot/default/fstab                      |  0
 .../etc/schroot/default/nssdatabases               |  0
 .../etc/sudoers.d/jenkins                          |  0
 .../etc/sudoers.d/jenkins-adm                      |  0
 .../usr/local/bin/dsa-check-packages               |  0
 .../usr/local/bin/dsa-check-running-kernel         |  0
 .../usr/local/sbin/nagios-check-libs               |  0
 hosts/odu3a-armhf-rb/etc/pbuilderrc                |  4 +-
 hosts/odu3a-armhf-rb/etc/postfix/main.cf           |  2 +-
 hosts/odxu4-armhf-rb/etc/pbuilderrc                |  4 +-
 hosts/odxu4-armhf-rb/etc/postfix/main.cf           |  2 +-
 hosts/odxu4b-armhf-rb/etc/pbuilderrc               |  4 +-
 hosts/odxu4b-armhf-rb/etc/postfix/main.cf          |  2 +-
 hosts/odxu4c-armhf-rb/etc/pbuilderrc               |  4 +-
 hosts/odxu4c-armhf-rb/etc/postfix/main.cf          |  2 +-
 hosts/opi2a                                        |  1 -
 hosts/opi2a-armhf-rb/etc/pbuilderrc                | 48 ----------------------
 hosts/opi2a-armhf-rb/etc/postfix/main.cf           | 41 ------------------
 hosts/opi2b-armhf-rb/etc/pbuilderrc                |  4 +-
 hosts/opi2b-armhf-rb/etc/postfix/main.cf           |  2 +-
 hosts/opi2c-armhf-rb/etc/pbuilderrc                |  4 +-
 hosts/opi2c-armhf-rb/etc/postfix/main.cf           |  2 +-
 hosts/profitbricks-build1-amd64/etc/pbuilderrc     |  4 +-
 hosts/profitbricks-build10-amd64/etc/pbuilderrc    |  4 +-
 hosts/profitbricks-build2-i386/etc/pbuilderrc      |  4 +-
 hosts/profitbricks-build3-amd64/etc/pbuilderrc     |  4 +-
 hosts/profitbricks-build4-amd64/etc/pbuilderrc     |  4 +-
 hosts/profitbricks-build5-amd64/etc/pbuilderrc     |  4 +-
 hosts/profitbricks-build6-i386/etc/pbuilderrc      |  4 +-
 hosts/profitbricks-build9-amd64/etc/pbuilderrc     |  4 +-
 hosts/rpi2b-armhf-rb/etc/pbuilderrc                |  4 +-
 hosts/rpi2b-armhf-rb/etc/postfix/main.cf           |  2 +-
 hosts/rpi2c-armhf-rb/etc/pbuilderrc                |  4 +-
 hosts/rpi2c-armhf-rb/etc/postfix/main.cf           |  2 +-
 hosts/wbd0-armhf-rb/etc/pbuilderrc                 |  4 +-
 hosts/wbd0-armhf-rb/etc/postfix/main.cf            |  2 +-
 hosts/wbq0-armhf-rb/etc/pbuilderrc                 |  4 +-
 hosts/wbq0-armhf-rb/etc/postfix/main.cf            |  2 +-
 job-cfg/reproducible.yaml                          |  6 +--
 update_jdn.sh                                      |  5 ---
 84 files changed, 101 insertions(+), 195 deletions(-)

diff --git a/README b/README
index d91840e..1ebbd20 100644
--- a/README
+++ b/README
@@ -141,7 +141,7 @@ Installation tests inside chroot environments.
 ** To test 'armhf' we are using 21 small boards donated by vagrant at d.o:
 *** five quad-cores (cbxi4a, cbxi4b, and ff4a) with 4gb ram,
 *** three octo-cores (odxu4, odxu4b and odxu4c) with 2gb ram,
-*** eight quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odu3a, opi2a, opi2b, and opi2c) with 2gb ram, 
+*** eight quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odu3a, opi2b, opi2c and jtk1a) with 2gb ram, 
 *** two dual-core (bbx15 and cb3a) with 2gb ram and,
 *** two quad-cores (rpi2b and rpi2c) with 1gb ram and
 *** three dual-cores (bpi0, hb0 and wbd0) with 1gb ram, each. 
diff --git a/bin/common-functions.sh b/bin/common-functions.sh
index 4bc4f47..e62d3d9 100755
--- a/bin/common-functions.sh
+++ b/bin/common-functions.sh
@@ -58,7 +58,7 @@ else
 		case $HOSTNAME in
 			jenkins|jenkins-test-vm|profitbricks-build*)
 				export MIRROR=http://ftp.de.debian.org/debian ;;
-			bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+			bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 				export MIRROR=http://ftp.us.debian.org/debian ;;
 			spectrum)
 				export MIRROR=none ;;
@@ -70,7 +70,7 @@ else
 		case $HOSTNAME in
 			jenkins|jenkins-test-vm|profitbricks-build*)
 				export http_proxy="http://localhost:3128" ;;
-			bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+			bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 				export http_proxy="http://10.0.0.15:8000/" ;;
 			spectrum)
 				export MIRROR=none ;;
diff --git a/bin/jenkins_node_definitions.sh b/bin/jenkins_node_definitions.sh
index 0f645c5..7bb985b 100755
--- a/bin/jenkins_node_definitions.sh
+++ b/bin/jenkins_node_definitions.sh
@@ -4,7 +4,7 @@
 # released under the GPLv=2
 
 # define Debian build nodes in use
-BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net wbq0-armhf-rb.debian.net cb3a-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net odu3a-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian [...]
+BUILD_NODES="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net wbq0-armhf-rb.debian.net cb3a-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net odu3a-armhf-rb.debian.net odxu4-armhf-rb.debian.net wbd0-armhf-rb.debian.net rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian [...]
 
 # return the ports sshd is listening on
 get_node_ssh_port() {
@@ -58,9 +58,6 @@ get_node_ssh_port() {
 	  ff4a-armhf-rb.debian.net)
 	    PORT=2241
 	    ;;
-	  opi2a-armhf-rb.debian.net)
-	    PORT=2236
-	    ;;
 	  opi2b-armhf-rb.debian.net)
 	    PORT=2238
 	    ;;
@@ -73,6 +70,9 @@ get_node_ssh_port() {
 	  opi2c-armhf-rb.debian.net)
 	    PORT=2245
 	    ;;
+	  jtk1a-armhf-rb.debian.net)
+	    PORT=2246
+	    ;;
 	  profitbricks-build*)
 	    PORT=22
 	    ;;
diff --git a/deploy_everywhere b/deploy_everywhere
index 8e94b2c..08f5aae 100755
--- a/deploy_everywhere
+++ b/deploy_everywhere
@@ -25,7 +25,7 @@
 
 START=$(date +'%s')
 GIT_REPO="git://anonscm.debian.org/qa/jenkins.debian.net.git"
-export HOSTS="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net [...]
+export HOSTS="profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net hb0-armhf-rb.debian.net wbq0-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net [...]
 echo
 echo -n "$(date) - "
 # real command, for running manually: cd ~jenkins-adm/jenkins.debian.net/ ; sudo -u jenkins-adm git pull ; ./update_jdn.sh
diff --git a/hosts/bbx15-armhf-rb/etc/pbuilderrc b/hosts/bbx15-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/bbx15-armhf-rb/etc/pbuilderrc
+++ b/hosts/bbx15-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/bbx15-armhf-rb/etc/postfix/main.cf b/hosts/bbx15-armhf-rb/etc/postfix/main.cf
index 7737c9b..bd6a830 100644
--- a/hosts/bbx15-armhf-rb/etc/postfix/main.cf
+++ b/hosts/bbx15-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = bbx15-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/bpi0-armhf-rb/etc/pbuilderrc
+++ b/hosts/bpi0-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/bpi0-armhf-rb/etc/postfix/main.cf b/hosts/bpi0-armhf-rb/etc/postfix/main.cf
index b26c480..d88bb51 100644
--- a/hosts/bpi0-armhf-rb/etc/postfix/main.cf
+++ b/hosts/bpi0-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = bpi0-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/cb3a-armhf-rb/etc/pbuilderrc b/hosts/cb3a-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/cb3a-armhf-rb/etc/pbuilderrc
+++ b/hosts/cb3a-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/cb3a-armhf-rb/etc/postfix/main.cf b/hosts/cb3a-armhf-rb/etc/postfix/main.cf
index 1ec3f76..922b4c4 100644
--- a/hosts/cb3a-armhf-rb/etc/postfix/main.cf
+++ b/hosts/cb3a-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = cb3a-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc
+++ b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf b/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf
index e560b97..a6f291c 100644
--- a/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf
+++ b/hosts/cbxi4a-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = cbxi4a-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc
+++ b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf b/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf
index 7301de0..a83aefc 100644
--- a/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf
+++ b/hosts/cbxi4b-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = cbxi4b-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf b/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf
index 4cac532..7c48ece 100644
--- a/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf
+++ b/hosts/cbxi4pro0-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = cbxi4pro0-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/ff2a-armhf-rb/etc/pbuilderrc b/hosts/ff2a-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/ff2a-armhf-rb/etc/pbuilderrc
+++ b/hosts/ff2a-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/ff2a-armhf-rb/etc/postfix/main.cf b/hosts/ff2a-armhf-rb/etc/postfix/main.cf
index 057a0e8..74d3de6 100644
--- a/hosts/ff2a-armhf-rb/etc/postfix/main.cf
+++ b/hosts/ff2a-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = ff2a-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/ff2b-armhf-rb/etc/pbuilderrc b/hosts/ff2b-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/ff2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/ff2b-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/ff2b-armhf-rb/etc/postfix/main.cf b/hosts/ff2b-armhf-rb/etc/postfix/main.cf
index 5730e48..db8114b 100644
--- a/hosts/ff2b-armhf-rb/etc/postfix/main.cf
+++ b/hosts/ff2b-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = ff2b-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/ff4a-armhf-rb/etc/pbuilderrc b/hosts/ff4a-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/ff4a-armhf-rb/etc/pbuilderrc
+++ b/hosts/ff4a-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/ff4a-armhf-rb/etc/postfix/main.cf b/hosts/ff4a-armhf-rb/etc/postfix/main.cf
index fbb83a4..24fe1b7 100644
--- a/hosts/ff4a-armhf-rb/etc/postfix/main.cf
+++ b/hosts/ff4a-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = ff4a-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/hb0-armhf-rb/etc/pbuilderrc b/hosts/hb0-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/hb0-armhf-rb/etc/pbuilderrc
+++ b/hosts/hb0-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/hb0-armhf-rb/etc/postfix/main.cf b/hosts/hb0-armhf-rb/etc/postfix/main.cf
index c7085cf..c7e1369 100644
--- a/hosts/hb0-armhf-rb/etc/postfix/main.cf
+++ b/hosts/hb0-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = hb0-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/jenkins-test-vm/etc/pbuilderrc b/hosts/jenkins-test-vm/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/jenkins-test-vm/etc/pbuilderrc
+++ b/hosts/jenkins-test-vm/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/jenkins/etc/munin/munin.conf b/hosts/jenkins/etc/munin/munin.conf
index 83810e4..4a6374b 100644
--- a/hosts/jenkins/etc/munin/munin.conf
+++ b/hosts/jenkins/etc/munin/munin.conf
@@ -354,8 +354,8 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
-[opi2a-armhf-rb.debian.net]
-    address ssh://jenkins@opi2a-armhf-rb.debian.net:2236/bin/nc localhost 4949
+[jtk1a-armhf-rb.debian.net]
+    address ssh://jenkins@jtk1a-armhf-rb.debian.net:2246/bin/nc localhost 4949
     use_node_name yes
     diskstats_latency.sda.avgwrwait.warning 0:20
     diskstats_latency.sda.avgrdwait.warning 0:10
@@ -497,5 +497,5 @@ contact.me.command mail -s "Munin notification ${var:host}" root
 #       node_order Totals fii.foo.com fay.foo.com
 #
 [debian.net;]
-	node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-a [...]
+	node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net bbx15-armhf-rb.debian.net bpi0-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-a [...]
 
diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/jenkins/etc/pbuilderrc
+++ b/hosts/jenkins/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/jtk1a b/hosts/jtk1a
new file mode 120000
index 0000000..cdc7036
--- /dev/null
+++ b/hosts/jtk1a
@@ -0,0 +1 @@
+jtk1a-armhf-rb/
\ No newline at end of file
diff --git a/hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions b/hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions
rename to hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions
diff --git a/hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/80proxy b/hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/80proxy
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/apt/apt.conf.d/80proxy
rename to hosts/jtk1a-armhf-rb/etc/apt/apt.conf.d/80proxy
diff --git a/hosts/opi2a-armhf-rb/etc/apt/listchanges.conf b/hosts/jtk1a-armhf-rb/etc/apt/listchanges.conf
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/apt/listchanges.conf
rename to hosts/jtk1a-armhf-rb/etc/apt/listchanges.conf
diff --git a/hosts/opi2a-armhf-rb/etc/apt/sources.list b/hosts/jtk1a-armhf-rb/etc/apt/sources.list
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/apt/sources.list
rename to hosts/jtk1a-armhf-rb/etc/apt/sources.list
diff --git a/hosts/opi2a-armhf-rb/etc/cron.d/dsa b/hosts/jtk1a-armhf-rb/etc/cron.d/dsa
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/cron.d/dsa
rename to hosts/jtk1a-armhf-rb/etc/cron.d/dsa
diff --git a/hosts/opi2a-armhf-rb/etc/munin/munin-node.conf b/hosts/jtk1a-armhf-rb/etc/munin/munin-node.conf
similarity index 97%
rename from hosts/opi2a-armhf-rb/etc/munin/munin-node.conf
rename to hosts/jtk1a-armhf-rb/etc/munin/munin-node.conf
index 65ba8e0..76c4ef2 100644
--- a/hosts/opi2a-armhf-rb/etc/munin/munin-node.conf
+++ b/hosts/jtk1a-armhf-rb/etc/munin/munin-node.conf
@@ -63,4 +63,4 @@ host *
 port 4949
 
 allow ^78\.137\.96\.196
-hostname opi2a-armhf-rb.debian.net
+hostname jtk1a-armhf-rb.debian.net
diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/df b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/df
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/df
rename to hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/df
diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/diskstats b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/diskstats
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/diskstats
rename to hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/diskstats
diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/munin-node b/hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/munin-node
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/munin/plugin-conf.d/munin-node
rename to hosts/jtk1a-armhf-rb/etc/munin/plugin-conf.d/munin-node
diff --git a/hosts/opi2a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds b/hosts/jtk1a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
rename to hosts/jtk1a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds
diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
rename to hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup
diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
rename to hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup
diff --git a/hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment b/hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
rename to hosts/jtk1a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment
diff --git a/hosts/bbx15-armhf-rb/etc/pbuilderrc b/hosts/jtk1a-armhf-rb/etc/pbuilderrc
similarity index 95%
copy from hosts/bbx15-armhf-rb/etc/pbuilderrc
copy to hosts/jtk1a-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/bbx15-armhf-rb/etc/pbuilderrc
+++ b/hosts/jtk1a-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/bpi0-armhf-rb/etc/postfix/main.cf b/hosts/jtk1a-armhf-rb/etc/postfix/main.cf
similarity index 90%
copy from hosts/bpi0-armhf-rb/etc/postfix/main.cf
copy to hosts/jtk1a-armhf-rb/etc/postfix/main.cf
index b26c480..7f9e760 100644
--- a/hosts/bpi0-armhf-rb/etc/postfix/main.cf
+++ b/hosts/jtk1a-armhf-rb/etc/postfix/main.cf
@@ -27,12 +27,12 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
 # information on enabling SSL in the smtp client.
 
-myhostname = bpi0-armhf-rb.debian.net
+myhostname = jtk1a-armhf-rb.debian.net
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
-mydestination = bpi0-armhf-rb.debian.net, localhost
-relayhost = 
+mydestination = jtk1a-armhf-rb.debian.net, localhost
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/opi2a-armhf-rb/etc/rc.local b/hosts/jtk1a-armhf-rb/etc/rc.local
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/rc.local
rename to hosts/jtk1a-armhf-rb/etc/rc.local
diff --git a/hosts/opi2a-armhf-rb/etc/schroot/default/fstab b/hosts/jtk1a-armhf-rb/etc/schroot/default/fstab
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/schroot/default/fstab
rename to hosts/jtk1a-armhf-rb/etc/schroot/default/fstab
diff --git a/hosts/opi2a-armhf-rb/etc/schroot/default/nssdatabases b/hosts/jtk1a-armhf-rb/etc/schroot/default/nssdatabases
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/schroot/default/nssdatabases
rename to hosts/jtk1a-armhf-rb/etc/schroot/default/nssdatabases
diff --git a/hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins b/hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins
rename to hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins
diff --git a/hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins-adm b/hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins-adm
similarity index 100%
rename from hosts/opi2a-armhf-rb/etc/sudoers.d/jenkins-adm
rename to hosts/jtk1a-armhf-rb/etc/sudoers.d/jenkins-adm
diff --git a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-packages b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-packages
similarity index 100%
rename from hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-packages
rename to hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-packages
diff --git a/hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel b/hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
similarity index 100%
rename from hosts/opi2a-armhf-rb/usr/local/bin/dsa-check-running-kernel
rename to hosts/jtk1a-armhf-rb/usr/local/bin/dsa-check-running-kernel
diff --git a/hosts/opi2a-armhf-rb/usr/local/sbin/nagios-check-libs b/hosts/jtk1a-armhf-rb/usr/local/sbin/nagios-check-libs
similarity index 100%
rename from hosts/opi2a-armhf-rb/usr/local/sbin/nagios-check-libs
rename to hosts/jtk1a-armhf-rb/usr/local/sbin/nagios-check-libs
diff --git a/hosts/odu3a-armhf-rb/etc/pbuilderrc b/hosts/odu3a-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/odu3a-armhf-rb/etc/pbuilderrc
+++ b/hosts/odu3a-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/odu3a-armhf-rb/etc/postfix/main.cf b/hosts/odu3a-armhf-rb/etc/postfix/main.cf
index 1d8ce97..473a5cd 100644
--- a/hosts/odu3a-armhf-rb/etc/postfix/main.cf
+++ b/hosts/odu3a-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = odu3a-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/odxu4-armhf-rb/etc/pbuilderrc b/hosts/odxu4-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/odxu4-armhf-rb/etc/pbuilderrc
+++ b/hosts/odxu4-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/odxu4-armhf-rb/etc/postfix/main.cf b/hosts/odxu4-armhf-rb/etc/postfix/main.cf
index e474731..86551d0 100644
--- a/hosts/odxu4-armhf-rb/etc/postfix/main.cf
+++ b/hosts/odxu4-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = odxu4-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/odxu4b-armhf-rb/etc/pbuilderrc b/hosts/odxu4b-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/odxu4b-armhf-rb/etc/pbuilderrc
+++ b/hosts/odxu4b-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/odxu4b-armhf-rb/etc/postfix/main.cf b/hosts/odxu4b-armhf-rb/etc/postfix/main.cf
index ea0750a..2fee1e0 100644
--- a/hosts/odxu4b-armhf-rb/etc/postfix/main.cf
+++ b/hosts/odxu4b-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = odxu4b-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilderrc b/hosts/odxu4c-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/odxu4c-armhf-rb/etc/pbuilderrc
+++ b/hosts/odxu4c-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/odxu4c-armhf-rb/etc/postfix/main.cf b/hosts/odxu4c-armhf-rb/etc/postfix/main.cf
index 7d66f03..375ed2d 100644
--- a/hosts/odxu4c-armhf-rb/etc/postfix/main.cf
+++ b/hosts/odxu4c-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = odxu4c-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/opi2a b/hosts/opi2a
deleted file mode 120000
index 48aff00..0000000
--- a/hosts/opi2a
+++ /dev/null
@@ -1 +0,0 @@
-opi2a-armhf-rb
\ No newline at end of file
diff --git a/hosts/opi2a-armhf-rb/etc/pbuilderrc b/hosts/opi2a-armhf-rb/etc/pbuilderrc
deleted file mode 100644
index a13ed5b..0000000
--- a/hosts/opi2a-armhf-rb/etc/pbuilderrc
+++ /dev/null
@@ -1,48 +0,0 @@
-# this is your configuration file for pbuilder.
-# the file in /usr/share/pbuilder/pbuilderrc is the default template.
-# /etc/pbuilderrc is the one meant for overwriting defaults in
-# the default template
-#
-# read pbuilderrc.5 document for notes on specific options.
-#
-# cater for different locations
-case $HOSTNAME in
-	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
-	*)										echo "unsupported host, exiting." ; exit 1 ;;
-esac
-# only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
-case $HOSTNAME in
-	profitbricks-build*i386)
-		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
-		EATMYDATA=yes ;;
-	*)	;;
-esac
-EXTRAPACKAGES=""	# better list them in bin/reproducible_setup_pbuilder.sh
-APTCACHE=""
-COMPRESSPROG="pigz"
-BUILDPLACE=/srv/workspace/pbuilder  # build in /srv/workspace, which is in tmpfs
-
-# there are software wanting /dev/shm writable, so give them so. There are tons
-# of bug shm related in pbuilder, that's just a workaround for all of them.
-# /run/shm is already mounted as a tmpfs by default.
-BINDMOUNTS="/dev/shm"
-# set PATH to predictable values, see #780729 and #780725
-PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
-
-# used for reproducible builds tests, when doing the 2nd build
-if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then
-	PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path"
-fi
-
-# needed to ignore failures due to running 398 days in the future…
-# (only on those 2 nodes running in the future…)
-if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBUILDER_OPERATION" in
-		create)
-			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-			;;
-		*)	;;
-	esac
-fi
diff --git a/hosts/opi2a-armhf-rb/etc/postfix/main.cf b/hosts/opi2a-armhf-rb/etc/postfix/main.cf
deleted file mode 100644
index 729202b..0000000
--- a/hosts/opi2a-armhf-rb/etc/postfix/main.cf
+++ /dev/null
@@ -1,41 +0,0 @@
-# See /usr/share/postfix/main.cf.dist for a commented, more complete version
-
-
-# Debian specific:  Specifying a file name will cause the first
-# line of that file to be used as the name.  The Debian default
-# is /etc/mailname.
-#myorigin = /etc/mailname
-
-smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
-biff = no
-
-# appending .domain is the MUA's job.
-append_dot_mydomain = no
-
-# Uncomment the next line to generate "delayed mail" warnings
-#delay_warning_time = 4h
-
-readme_directory = no
-
-# TLS parameters
-smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
-smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
-smtpd_use_tls=yes
-smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
-smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
-
-# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
-# information on enabling SSL in the smtp client.
-
-myhostname = opi2a-armhf-rb.debian.net
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-myorigin = /etc/mailname
-mydestination = opi2a-armhf-rb.debian.net, localhost
-relayhost = 
-#mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
-mynetworks = 127.0.0.0/8
-mailbox_size_limit = 0
-recipient_delimiter = +
-inet_interfaces = all
-mailbox_command = /usr/bin/procmail -a "$EXTENSION"
diff --git a/hosts/opi2b-armhf-rb/etc/pbuilderrc b/hosts/opi2b-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/opi2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/opi2b-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/opi2b-armhf-rb/etc/postfix/main.cf b/hosts/opi2b-armhf-rb/etc/postfix/main.cf
index a690d2a..1fd5938 100644
--- a/hosts/opi2b-armhf-rb/etc/postfix/main.cf
+++ b/hosts/opi2b-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = opi2b-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/opi2c-armhf-rb/etc/pbuilderrc b/hosts/opi2c-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/opi2c-armhf-rb/etc/pbuilderrc
+++ b/hosts/opi2c-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/opi2c-armhf-rb/etc/postfix/main.cf b/hosts/opi2c-armhf-rb/etc/postfix/main.cf
index 9c75c1c..e94116e 100644
--- a/hosts/opi2c-armhf-rb/etc/postfix/main.cf
+++ b/hosts/opi2c-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = opi2c-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilderrc b/hosts/profitbricks-build1-amd64/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build1-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilderrc b/hosts/profitbricks-build10-amd64/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build10-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build10-amd64/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/profitbricks-build2-i386/etc/pbuilderrc b/hosts/profitbricks-build2-i386/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build2-i386/etc/pbuilderrc
+++ b/hosts/profitbricks-build2-i386/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/profitbricks-build3-amd64/etc/pbuilderrc b/hosts/profitbricks-build3-amd64/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build3-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build3-amd64/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilderrc b/hosts/profitbricks-build4-amd64/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build4-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build4-amd64/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilderrc b/hosts/profitbricks-build5-amd64/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build5-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build5-amd64/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/profitbricks-build6-i386/etc/pbuilderrc b/hosts/profitbricks-build6-i386/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build6-i386/etc/pbuilderrc
+++ b/hosts/profitbricks-build6-i386/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/profitbricks-build9-amd64/etc/pbuilderrc b/hosts/profitbricks-build9-amd64/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/profitbricks-build9-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build9-amd64/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/rpi2b-armhf-rb/etc/pbuilderrc b/hosts/rpi2b-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/rpi2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/rpi2b-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/rpi2b-armhf-rb/etc/postfix/main.cf b/hosts/rpi2b-armhf-rb/etc/postfix/main.cf
index ea91cee..f57f170 100644
--- a/hosts/rpi2b-armhf-rb/etc/postfix/main.cf
+++ b/hosts/rpi2b-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = rpi2b-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/rpi2c-armhf-rb/etc/pbuilderrc b/hosts/rpi2c-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/rpi2c-armhf-rb/etc/pbuilderrc
+++ b/hosts/rpi2c-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/rpi2c-armhf-rb/etc/postfix/main.cf b/hosts/rpi2c-armhf-rb/etc/postfix/main.cf
index 65fb415..bc41a7a 100644
--- a/hosts/rpi2c-armhf-rb/etc/postfix/main.cf
+++ b/hosts/rpi2c-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = rpi2c-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/wbd0-armhf-rb/etc/pbuilderrc b/hosts/wbd0-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/wbd0-armhf-rb/etc/pbuilderrc
+++ b/hosts/wbd0-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/wbd0-armhf-rb/etc/postfix/main.cf b/hosts/wbd0-armhf-rb/etc/postfix/main.cf
index 3d93e6c..3b5be28 100644
--- a/hosts/wbd0-armhf-rb/etc/postfix/main.cf
+++ b/hosts/wbd0-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = wbd0-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilderrc b/hosts/wbq0-armhf-rb/etc/pbuilderrc
index a13ed5b..127b42f 100644
--- a/hosts/wbq0-armhf-rb/etc/pbuilderrc
+++ b/hosts/wbq0-armhf-rb/etc/pbuilderrc
@@ -8,14 +8,14 @@
 # cater for different locations
 case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
 esac
 # only use eatmydata on armhf+i386 - on amd64 we build in tmpfs anyway
 case $HOSTNAME in
 	profitbricks-build*i386)
 		EATMYDATA=yes ;;
-	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)
+	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*|jtk1*)
 		EATMYDATA=yes ;;
 	*)	;;
 esac
diff --git a/hosts/wbq0-armhf-rb/etc/postfix/main.cf b/hosts/wbq0-armhf-rb/etc/postfix/main.cf
index 0053b2b..98ef11c 100644
--- a/hosts/wbq0-armhf-rb/etc/postfix/main.cf
+++ b/hosts/wbq0-armhf-rb/etc/postfix/main.cf
@@ -32,7 +32,7 @@ alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 myorigin = /etc/mailname
 mydestination = wbq0-armhf-rb.debian.net, localhost
-relayhost = 
+relayhost = mail.holgerlevsen.de 
 #mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 7c293c3..2e5c047 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -317,12 +317,12 @@
                 - 'ff2b':           { my_arch: 'armhf' }
                 - 'ff4a':           { my_arch: 'armhf' }
                 - 'hb0':            { my_arch: 'armhf' }
+                - 'jtk1a':          { my_arch: 'armhf' }
                 - 'wbq0':           { my_arch: 'armhf' }
                 - 'odxu4':          { my_arch: 'armhf' }
                 - 'odxu4b':         { my_arch: 'armhf' }
                 - 'odxu4c':         { my_arch: 'armhf' }
                 - 'odu3a':          { my_arch: 'armhf' }
-                - 'opi2a':          { my_arch: 'armhf' }
                 - 'opi2b':          { my_arch: 'armhf' }
                 - 'opi2c':          { my_arch: 'armhf' }
                 - 'wbd0':           { my_arch: 'armhf' }
@@ -367,12 +367,12 @@
                 - 'ff2b':           { my_arch: 'armhf' }
                 - 'ff4a':           { my_arch: 'armhf' }
                 - 'hb0':            { my_arch: 'armhf' }
+                - 'jtk1a':          { my_arch: 'armhf' }
                 - 'wbq0':           { my_arch: 'armhf' }
                 - 'odxu4':          { my_arch: 'armhf' }
                 - 'odxu4b':         { my_arch: 'armhf' }
                 - 'odxu4c':         { my_arch: 'armhf' }
                 - 'odu3a':          { my_arch: 'armhf' }
-                - 'opi2a':          { my_arch: 'armhf' }
                 - 'opi2b':          { my_arch: 'armhf' }
                 - 'opi2c':          { my_arch: 'armhf' }
                 - 'wbd0':           { my_arch: 'armhf' }
@@ -557,7 +557,7 @@
 
         # could have all archs in one block, but it seems cleaner this way
         # to choose new jobs:
-        #       for i in bbx15 bpi0 cbxi4a cbxi4b cbxi4pro0 cb3a ff2a ff2b ff4a hb0 odxu4 odxu4b odxu4c odu3a opi2a opi2b opi2c rpi2b rpi2c wbd0 wbq0 ; do echo "$i: " ; grep my_node1 job-cfg/reproducible.yaml|grep armhf|grep $i-armhf ; echo ; done
+        #       for i in bbx15 bpi0 cbxi4a cbxi4b cbxi4pro0 cb3a ff2a ff2b ff4a hb0 jtk1a odxu4 odxu4b odxu4c odu3a opi2b opi2c rpi2b rpi2c wbd0 wbq0 ; do echo "$i: " ; grep my_node1 job-cfg/reproducible.yaml|grep armhf|grep $i-armhf ; echo ; done
         #       8 jobs for quad-cores with 4 gb ram
         #       6 jobs for octo-cores with 2 gb ram
         #       6 jobs for quad-cores with 2 gb ram
diff --git a/update_jdn.sh b/update_jdn.sh
index efadedc..640b12b 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -501,11 +501,6 @@ if [ $BASEDIR/hosts/$HOSTNAME/etc/munin -nt $STAMP ] || [ ! -f $STAMP ] ; then
 		for i in apache_accesses apache_volume ; do sudo ln -s /usr/share/munin/plugins/$i $i ; done
 		sudo ln -s /usr/share/munin/plugins/loggrep jenkins_oom
 	fi
-	if [ "$HOSTNAME" != "opi2a" ] ; then
-		# opi2a is strangely broken
-		# so this is just a hackish workaround for that…
-		sudo service munin-node force-reload
-	fi
 fi
 explain "packages configured."
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git

