From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 7 Dec 2012 17:57:51 +0000 (+0100)
Subject: puppet, stop putting all the software I just removed back onto the host
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f9c803574237cef7d1dc120866b04254b2dcf367;p=mirror%2Fdsa-puppet.git

puppet, stop putting all the software I just removed back onto the host
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 8810951ab..a87158672 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -151,7 +151,6 @@ footer:
   #zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   backports_master:
-    - bizet.debian.org
     - morricone.debian.org
   bugsmaster:
   bugsmx:
@@ -192,7 +191,6 @@ services:
 host_settings:
   heavy_exim:
     - bellini.debian.org
-    - bizet.debian.org
     - busoni.debian.org
     - buxtehude.debian.org
     - chopin.debian.org
@@ -234,7 +232,6 @@ host_settings:
     - merikanto.debian.org
     - rietz.debian.org
   apache2_backports_mirror:
-    - bizet.debian.org
     - englund.debian.org
     - morricone.debian.org
   timeserver:
diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index e832a9874..90156d273 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -50,7 +50,6 @@ debian.net: user=nobody group=Debian directory=/org/star.debian.star/
 debian.eu: user=nobody group=Debian directory=/org/star.debian.star/"
 
         when "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/"
-        when "bizet.debian.org"     then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/"
 
         when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/"
 
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index a1eb9722b..17fa29cb4 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -25,7 +25,7 @@ Defaults        secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/
 Host_Alias	QAHOSTS		= master, quantz, stabile
 Host_Alias	WEBHOSTS	= wolkenstein
 Host_Alias	SECHOSTS	= chopin
-Host_Alias	FTPHOSTS	= franck, morricone, bizet
+Host_Alias	FTPHOSTS	= franck, morricone
 Host_Alias	ZIVITHOSTS	= zelenka, zandonai
 Host_Alias	AACRAIDHOSTS	= bellini, morricone, paganini, respighi, beethoven, pettersson
 Host_Alias	MEGARAIDHOSTS	= grieg, rautavaara, sibelius