merulo new style porterbox

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 7a88be1a40f2de77c291074227500a6584c5d0c2..9fdbb8301e58b1195d89fd7ed15ccec428037a84 100644 (file)
--- 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 5c8cd49e906edf99f25687e181ad152402f9ae1e..52b97764fe6aa888a30b56fb72842f3fe673c938 100644 (file)
--- 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