Decommission zee (RT#2859)

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 2fea2b4..45cbc86 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -280,7 +280,6 @@ host_settings:
     - vitry.debian.org
     - zandonai.debian.org
     - zappa.debian.org
-    - zee.debian.org
     - zemlinsky.debian.org
   #wheezy:
   #  - harris.debian.org
@@ -532,7 +531,6 @@ host_settings:
     wieck.debian.org: mailout.debian.org
     zandonai.debian.org: mailout.debian.org
     zappa.debian.org: mailout.debian.org
-    zee.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
     zemlinsky.debian.org: mailout.debian.org
   mail_port:

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index a1c2662..f47b92f 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -19,7 +19,6 @@ when /(alkman|caballero|merulo|mundy).debian.org/: ignore << "samhain"
 when "powell.debian.org":               ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
 when "rossini.debian.org":              ignore << %w{ganeti2}
 when "franck.debian.org":               ignore << %w{python-apt}
-when "zee.debian.org":                  ignore << %w{dpkg-dev dpkg}
 when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/: ignore << %w{flash-kernel linux-firmware-image}
 when /(harris|hoiby).debian.org/:       ignore << %w{flash-kernel puppet puppet-common kernel linux-firmware-image}
 when /(hartmann|hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel puppet puppet-common kernel linux-firmware-image schroot schroot-common}

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index a6edeee..d0f32ba 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -180,4 +180,4 @@ geodnssync  geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
 %porter-mips   eder,gabrielli=(root)   NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-ppc    partch=(root)           NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-s390   zelenka=(root)          NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-sparc  smetana,sperger,zee=(root)      NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-sparc  smetana,sperger=(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 2e17944..8202d7f 100644 (file)
--- a/modules/sudo/files/lenny/sudoers
+++ b/modules/sudo/files/lenny/sudoers
@@ -177,4 +177,4 @@ geodnssync  geo1,geo2,geo3=(root)   NOPASSWD: /usr/sbin/rndc reconfig
 %porter-ia64   merulo=(root)           NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-mips   gabrielli=(root)        NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
 %porter-s390   zelenka=(root)          NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
-%porter-sparc  smetana,sperger,zee=(root)      NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot
+%porter-sparc  smetana,sperger=(root)  NOPASSWD: /usr/sbin/upgrade-porter-chroots, /usr/bin/apt-in-chroot