From 7bf7eb707f3693636bc5799ce801e2e60b60046e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 19 Mar 2012 13:59:13 +0100 Subject: [PATCH 1/1] Decommission agnesi (RT#3697) --- modules/debian-org/misc/local.yaml | 3 --- modules/ssh/templates/sshd_config.erb | 1 - modules/sudo/files/common/sudoers | 1 - modules/sudo/files/lenny/sudoers | 1 - 4 files changed, 6 deletions(-) diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 56f31c54..d9144106 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -1,7 +1,6 @@ --- nameinfo: abel.debian.org: Carl Friedrich Abel (1723 - 1787) - agnesi.debian.org: Maria Teresa Agnesi (October 17th, 1720 - January 19th, 1795) 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) @@ -413,7 +412,6 @@ host_settings: # - zelenka.debian.org smarthost: abel.debian.org: mailout.debian.org - agnesi.debian.org: mailout.debian.org agricola.debian.org: mailout.debian.org alain.debian.org: mailout.debian.org albeniz.debian.org: mailout.debian.org @@ -556,7 +554,6 @@ host_settings: piatti.debian.org: 2025 zappa.debian.org: 587 no_munin: - - agnesi.debian.org - allegri.debian.org - escher.debian.org - fano.debian.org diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb index 93b39c5f..0f8657ae 100644 --- a/modules/ssh/templates/sshd_config.erb +++ b/modules/ssh/templates/sshd_config.erb @@ -5,7 +5,6 @@ Port 22 <%= extraports = case fqdn when "ravel.debian.org" then "Port 443" - when "agnesi.debian.org" then "Port 2260" end extraports %> diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index fa4e8f3d..a6edeee3 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -43,7 +43,6 @@ root ALL=(ALL) ALL %adm ALL=(ALL) ALL %adm ALL=(ALL) NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get upgrade, /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, /usr/sbin/upgrade-porter-chroots -admin agnesi=(ALL) ALL %zivit-admins ZIVITHOSTS=(ALL) NOPASSWD: ALL # nagios diff --git a/modules/sudo/files/lenny/sudoers b/modules/sudo/files/lenny/sudoers index 3809ee75..2e179442 100644 --- a/modules/sudo/files/lenny/sudoers +++ b/modules/sudo/files/lenny/sudoers @@ -41,7 +41,6 @@ root ALL=(ALL) ALL %adm ALL=(ALL) ALL %adm ALL=(ALL) NOPASSWD: /usr/bin/apt-get update, /usr/bin/apt-get upgrade, /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, /usr/sbin/upgrade-porter-chroots -admin agnesi=(ALL) ALL %zivit-admins ZIVITHOSTS=(ALL) NOPASSWD: ALL # nagios -- 2.39.2