From: Stephen Gran <steve@lobefin.net>
Date: Sat, 3 Jul 2010 12:13:17 +0000 (+0000)
Subject: some more ries -> franck work
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8874d85ca7ad6802d6f580ec6838adf420670d6d;p=dsa-puppet.git

some more ries -> franck work

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 2c38aff6..8e7e6518 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -130,6 +130,7 @@ host_settings:
     - busoni.debian.org
     - chopin.debian.org
     - draghi.debian.org
+    - franck.debian.org
     - grieg.debian.org
     - klecker.debian.org
     - master.debian.org
diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index 2d69a59c..8518a9df 100644
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -998,6 +998,7 @@ check_message:
 begin rewrite
 
 \N^buildd_(.*)@ries\.debian\.org$\N buildd_$1@buildd.debian.org T
+\N^buildd_(.*)@franck\.debian\.org$\N buildd_$1@buildd.debian.org T
 \N^buildd_(.*)@klecker\.debian\.org$\N buildd_$1@buildd.debian.org T
 *@debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T
 *@people.debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 8de764a3..11df397c 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -54,7 +54,7 @@ nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/"
 
         when "ravel.debian.org" then "women.debian.org: user=nobody group=mujeres directory=/org/women.debian.org/mail"
 
-        when "ries.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail
+        when "ries.debian.org, franck.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail
 ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp.debian.org/mail group_writable=true"
 
         when "spohr.debian.org" then "rt.debian.org: user=rt group=rt directory=/srv/rt.debian.org/mail
diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index bf1a249c..20dc66c6 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -17,7 +17,7 @@ when /(dijkstra|unger|luchesi|schumann).debian.org/: ignore << "qemu-kvm"
 when /(lebrun|schroeder).debian.org/:   ignore << "firmware-linux-nonfree"
 when /(mayer|paer|peri|penalosa).debian.org/: ignore << "linux-base"
 when "powell.debian.org":               ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
-when "ries.debian.org":                 ignore << %w{apt-utils apt libapt-pkg-dev}
+when "/(ries|franck).debian.org/":      ignore << %w{apt-utils apt libapt-pkg-dev}
 when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
 end