From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 10 Jun 2013 20:41:39 +0000 (+0200)
Subject: decommission holter
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4dc60913c2399b838631eba9c1488b7cb02263b7;p=mirror%2Fdsa-puppet.git

decommission holter
---

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index d8990b1fc..16807bb81 100644
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -68,7 +68,7 @@ class apache2 {
 		script => 'ps_',
 	}
 
-	if $::hostname in [holter,beach,buxtehude,picconi,pkgmirror-1and1] {
+	if $::hostname in [beach,buxtehude,picconi,pkgmirror-1and1] {
 		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 987a5a2d8..bf17878de 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -62,7 +62,6 @@ nameinfo:
   hebden.debian.org: John Hebden (1712 - 1765)
   henze.debian.org: Hans Werner Henze (July 1st, 1926 - October 27th, 2012)
   hoiby.debian.org: Lee Henry Hoiby (February 17th, 1926 - March 28th, 2011)
-  holter.debian.org: Iver Holter (December 13th, 1850 - January 27th, 1941)
   jenkins.debian.org: John Jenkins (1592 - 1678)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
@@ -309,7 +308,6 @@ host_settings:
     - henze.debian.org
     - hildegard.debian.org
     - hoiby.debian.org
-    - holter.debian.org
     - howells.debian.org
     - hummel.debian.org
     - klecker.debian.org
diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index a2b88eec1..f1e7953a7 100644
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -29,7 +29,7 @@ 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
-Host_Alias	MPTRAIDHOSTS	= holter, barber, biber, cilea, vitry, orff
+Host_Alias	MPTRAIDHOSTS	= barber, biber, cilea, vitry, orff
 Host_Alias	MEGACTLHOSTS	= lindberg, englund, nielsen
 Host_Alias	LISTHOSTS	= bendel
 Host_Alias	PORTERBOXES	= abel, agricola, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka