From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 1 Apr 2012 09:28:02 +0000 (+0200)
Subject: Decommission goetz and albeniz (RT#3693; RT#3692)
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=52c1589671e59a6c153ff4b19fa6012fa5212867;p=dsa-puppet.git

Decommission goetz and albeniz (RT#3693; RT#3692)
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 189a6f2d..2bea33e1 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -3,7 +3,6 @@ nameinfo:
   abel.debian.org: Carl Friedrich Abel (1723 - 1787)
   agricola.debian.org: Alexander Agricola (1445 or 1446 - August 15th, 1506)
   alain.debian.org: Jehan Alain (1911 - 1940)
-  albeniz.debian.org: Isaac Manuel Francisco Albéniz i Pascual (May 29th, 1860 - May 18th, 1909)
   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)
@@ -46,7 +45,6 @@ nameinfo:
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
   gombert.debian.org: Nicolas Gombert (c. 1495 – c. 1560)
   dukas.debian.org: Paul Dukas (1865 - 1935)
-  goetz.debian.org: Hermann Gustav Goetz (December 7th, 1840 - December 3rd, 1876)
   grieg.debian.org: Edvard Hagerup Grieg (June 15th, 1843 - September 4th, 1907)
   handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759)
   harris.debian.org: Sir William Henry Harris (March 28th, 1883 - September 6th, 1973)
@@ -251,7 +249,6 @@ host_settings:
     - fasch.debian.org
     - field.debian.org
     - finzi.debian.org
-    - goetz.debian.org
     - hartmann.debian.org
     - hasse.debian.org
     - hebden.debian.org
@@ -406,7 +403,6 @@ host_settings:
     abel.debian.org: mailout.debian.org
     agricola.debian.org: mailout.debian.org
     alain.debian.org: mailout.debian.org
-    albeniz.debian.org: mailout.debian.org
     alkman.debian.org: mailout.debian.org
     alwyn.debian.org: mailout.debian.org
     ancina.debian.org: mailout.debian.org
@@ -448,7 +444,6 @@ host_settings:
     geo3.debian.org: mailout.debian.org
     glinka.debian.org: mailout.debian.org
     gluck.debian.org: mailout.debian.org
-    goetz.debian.org: mailout.debian.org
     handel.debian.org: mailout.debian.org
     harris.debian.org: mailout.debian.org
     hartmann.debian.org: mailout.debian.org
diff --git a/modules/exim/templates/locals.erb b/modules/exim/templates/locals.erb
index 52564a64..07c6b8b4 100644
--- a/modules/exim/templates/locals.erb
+++ b/modules/exim/templates/locals.erb
@@ -1,11 +1,10 @@
-##
+#/#
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
 <%=
 locals = case fqdn
-        when "albeniz.debian.org" then "deb-alpha1.sanger.ac.uk"
         when "ball.debian.org" then "ball.einval.com"
         when "malo.debian.org" then "malo.debian.osuosl.org"
         when "rem.debian.org" then "rem.rfc822.org"
diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index d0f32ba8..8f37e500 100644
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -171,7 +171,6 @@ geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /usr/sbin/rndc reconfig
 %fossy		vivaldi=(fossy)		ALL
 
 # Porter work
-%porter-alpha	albeniz=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-armel	abel,agricola=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-armel	harris=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-amd64	barriere,pergolesi=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
diff --git a/modules/sudo/files/lenny/sudoers b/modules/sudo/files/lenny/sudoers
index 8202d7fc..60859d1a 100644
--- a/modules/sudo/files/lenny/sudoers
+++ b/modules/sudo/files/lenny/sudoers
@@ -169,7 +169,6 @@ geodnssync	geo1,geo2,geo3=(root)	NOPASSWD: /usr/sbin/rndc reconfig
 %fossy		vivaldi=(fossy)		ALL
 
 # Porter work
-%porter-alpha	albeniz=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-armel	abel,agricola=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-armel	harris=(root)		NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-amd64	pergolesi=(root)	NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot