From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 22 Apr 2013 16:59:49 +0000 (+0200)
Subject: merulo new style porterbox
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8738ae49823878e5477bcaceed1514e4974b84a2;p=mirror%2Fdsa-puppet.git

merulo new style porterbox
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 7a88be1a4..9fdbb8301 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -192,8 +192,10 @@ services:
     - kaufmann.debian.org
   # new style porterbox (schroot, dd installable packages etc)
   porterbox:
+    # once they are all on new-style, we can use ldap for this
     - barriere.debian.org
     - fischer.debian.org
+    - merulo.debian.org
     - smetana.debian.org
 host_settings:
   heavy_exim:
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 5c8cd49e9..52b97764f 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -32,7 +32,7 @@ Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius
 Host_Alias	MPTRAIDHOSTS	= fasch, holter, barber, biber, cilea, vitry, krenek, orff
 Host_Alias	MEGACTLHOSTS	= lindberg, englund, nielsen
 Host_Alias	LISTHOSTS	= bendel
-Host_Alias	PORTERBOXES	= barriere, fischer, smetana
+Host_Alias	PORTERBOXES	= barriere, fischer, merulo, smetana
 
 # Cmnd alias specification