From: Héctor Orón Martínez <zumbi@debian.org>
Date: Wed, 21 May 2014 10:49:18 +0000 (+0200)
Subject: alwyn.d.o: decommision
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=933244a276b3326e8b5701601af15f831c0adf32

alwyn.d.o: decommision

Signed-off-by: Héctor Orón Martínez <zumbi@debian.org>
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 902c5c22..e0cd6223 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -2,7 +2,6 @@
 nameinfo:
   abel.debian.org: Carl Friedrich Abel (1723 - 1787)
   adayevskaya.debian.org: Ella Georgiyevna Adayevskaya (February, 22nd 1846 [O.S. February 10th] - July 26th, 1926)
-  alwyn.debian.org: William Alwyn (1905 - 1985)
   ancina.debian.org: Giovanni Giovenale Ancina (October 19th, 1545 - August 30th, 1604)
   antheil.debian.org: George Antheil (1900 - 1959)
   arcadelt.debian.org: Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14th, 1568)
@@ -215,7 +214,6 @@ host_settings:
     - zelenka.debian.org
     # buildd
     - alkman.debian.org
-    - alwyn.debian.org
     - ancina.debian.org
     - antheil.debian.org
     - arcadelt.debian.org
@@ -261,7 +259,6 @@ host_settings:
     - rapoport.debian.org
   broken-rtc:
     - abel.debian.org
-    - alwyn.debian.org
     - ancina.debian.org
     - antheil.debian.org
     - arnold.debian.org
diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 4b622e3e..388048ea 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -82,7 +82,7 @@ class ferm::per-host {
 				rule        => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
 			}
 		}
-		abel,alwyn,rietz,jenkins: {
+		abel,rietz,jenkins: {
 			@ferm::rule { 'dsa-tftp':
 				description     => 'Allow tftp access',
 				rule            => '&SERVICE(udp, 69)'
diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 5fe5f802..cdb6e346 100644
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -13,7 +13,7 @@ when /zappa.debian.org/ then                                   ignore << %w{samh
 when /(mayer|corelli).debian.org/ then                         ignore << "linux-base"
 when /(alkman|caballero|merulo|mundy|zani).debian.org/ then    ignore << "samhain"
 when "franck.debian.org" then                                  ignore << %w{python-apt}
-when /(abel|arnold|alwyn|antheil).debian.org/ then  ignore << %w{flash-kernel linux-firmware-image}
+when /(abel|arnold|antheil).debian.org/ then  ignore << %w{flash-kernel linux-firmware-image}
 when /harris.debian.org/ then                                  ignore << %w{flash-kernel kernel linux-firmware-image}
 when /(hasse|henze|howells|hummel|hoiby).debian.org/ then ignore << %w{flash-kernel kernel linux-firmware-image}
 when /(parry|partch).debian.org/ then                          ignore << "yaboot"