verdi no longer with us

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 9ef58b4..bb82cba 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -70,7 +70,6 @@ nameinfo:
   tartini.debian.org: Giuseppe Tartini (April 8, 1692 - February 26, 1770)
   unger.debian.org: Caroline Unger (October 28, 1803 - March 23, 1877)
   valente.debian.org: Vincenzo Valente (February 21, 1855 - September 6, 1921)
-  verdi.debian.org: Giuseppe Fortunino Francesco Verdi (October 9 or 10, 1813 - January 27, 1901)
   vivaldi.debian.org: Antonio Lucio Vivaldi (March 4, 1678 - July 28, 1741)
   voltaire.debian.org: François-Marie Arouet (Voltaire) (21 November 1694 - 30 May 1778)
   wagner.debian.org: Wilhelm Richard Wagner (22 May 1813 - 13 February 1883)
@@ -82,7 +81,6 @@ footer:
   bartok.debian.org: "Documentation: gluck:/org/admin.debian.org/doc/backup.debian.org"
   lebrun.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   schroeder.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
-  verdi.debian.org: "- This host is using an iptables firewall.  See /etc/ferm/ferm.conf"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster: rietz.debian.org

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index b2b5c5d..f92e167 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -70,11 +70,6 @@ command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /o
 command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/klecker.debian.org/etc",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:194.109.137.218,194.109.137.218,2001:888:2000:12::2" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAriwsLwjaMXYsAodm//tVxCU4uy4bQJ2Y5vPPXHMMyCgs+5U9iz09Uk2Kl9FMJW8kIeJCF+16sOOwgiWR1CoyQ5RWK/qJhf/AyNGajxIc9hviVPy0mbPlc8FFejbgpat9e35y3eSCan7SLVy6VTWhUqeyZUptr/K879UcuVJi1o0= da-backup for etc on klecker.debian.org
 command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/services/security.debian.org",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:194.109.137.218,194.109.137.218,2001:888:2000:12::2" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA6nnOG2Kj9NnqCKxwqsw+LUMJrfzFREnd4rsDoLqGWO0uzhQbYjjGN52Pij1HjzTVapP2TTJ+8IjOju2zK7rtHmcxJiw3r6mrn1tB7ZKwhy5TqKxVByD7YmjRsjmdOiMetkzF2qCoFbqky0/cRylhtja3FuywRmvHm5b/U6/kpN0= da-backup for security on klecker.debian.org
 
-#
-# verdi.debian.org
-#
-command="rsync --server -vlHogDtprz --delete --delete-after --ignore-errors . /org/backup.debian.org/staging/verdi.debian.org/etc",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="::ffff:192.54.42.193,192.54.42.193" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwLb4V/5VwMHXznNDTsPqWl+mH3Zijp2v2c0ziJvqiVmgZDRbIsGa6IGhxeOlXhQJoVRjKI8Eg1sBytK8TEdWU0H1o8tB7VudqFn/6Jef4PdEubwRUykrS87pxAYoRB6mzIcXPWmKwTtYUN6Mv2ybqOYOgHLqM+aDAb1ceKOS208= da-backup for etc on verdi.debian.org
-
 #
 # murphy.debian.org
 #

diff --git a/modules/sudo/files/per-host/verdi.debian.org/NOT-PUPPETIZED b/modules/sudo/files/per-host/verdi.debian.org/NOT-PUPPETIZED
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/modules/sudo/files/per-host/verdi.debian.org/sudoers b/modules/sudo/files/per-host/verdi.debian.org/sudoers
deleted file mode 100644 (file)
index 659f8ad..0000000
--- a/modules/sudo/files/per-host/verdi.debian.org/sudoers
+++ /dev/null
@@ -1,28 +0,0 @@
-##
-## 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
-##
-
-# /etc/sudoers
-#
-# This file MUST be edited with the 'visudo' command as root.
-#
-# See the man page for details on how to write a sudoers file.
-#
-
-# Host alias specification
-
-# User alias specification
-
-# Cmnd alias specification
-
-# User privilege specification
-root   ALL=(ALL) ALL
-%adm   ALL=(ALL) ALL
-%adm    ALL=(ALL) NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get dist-upgrade, /usr/bin/apt-get clean, /usr/sbin/samhain -t check -i -p err -s none -l none -m none
-
-%volatile ALL=(volatile) ALL
-%mirroradm ALL=(archvsync) ALL
-
-nagios  ALL=(ALL) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-dabackup ""
-nagios  ALL=(ALL) NOPASSWD: /usr/sbin/samhain -t check --foreground -p err -s none -l none -m none