From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 12 Jul 2012 16:38:26 +0000 (+0200)
Subject: Add buxtehude
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=81539d50730aeffc1418d8f597a90587ba1594a0;p=mirror%2Fdsa-puppet.git

Add buxtehude
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index aed20f09e..b89bafe12 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -77,7 +77,7 @@ class apache2 {
 		}
 	}
 
-	if $::hostname in [busoni,duarte,holter,lindberg,master,powell,beach,widor] {
+	if $::hostname in [busoni,duarte,holter,lindberg,master,powell,beach,buxtehude,widor] {
 		include apache2::dynamic
 	} else {
 		@ferm::rule { 'dsa-http':
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index d45b9c1f3..9b52c93bc 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -154,6 +154,7 @@ services:
   bugsmaster:
   bugsmx:
     - busoni.debian.org
+    - buxtehude.debian.org
   bugs_mirror:
     - beach.debian.org
   dbmaster:
@@ -191,6 +192,7 @@ host_settings:
     - bellini.debian.org
     - bizet.debian.org
     - busoni.debian.org
+    - buxtehude.debian.org
     - chopin.debian.org
     - draghi.debian.org
     - franck.debian.org
diff --git a/modules/exim/templates/submission-domains.erb b/modules/exim/templates/submission-domains.erb
index 0254419bb..bfbe0430f 100644
--- a/modules/exim/templates/submission-domains.erb
+++ b/modules/exim/templates/submission-domains.erb
@@ -3,6 +3,6 @@
 ### USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ###
 
-<% if scope.lookupvar('::hostname') == 'busoni' %>
+<% if %w{busoni buxtehude}.include?( scope.lookupvar('::hostname') ) %>
 bugs.debian.org
 <% end %>
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 8f7b4b06a..fa6eef43a 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -22,6 +22,7 @@ vdoms = case scope.lookupvar('::fqdn')
         when "bellini.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/org/popcon.debian.org/mail/"
 
         when "busoni.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
+        when "buxtehude.debian.org" then "bugs.debian.org: user=debbugs group=debbugs directory=/srv/bugs.debian.org/mail"
 
         when "chopin.debian.org" then "security.debian.org: user=mail_security group=nogroup directory=/srv/security-master.debian.org/mail/"