From a81d4e72fcd4d6aebd06ee82f52c825542caf1d9 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 15 Jun 2016 16:25:00 +0200 Subject: [PATCH] Decommission lebrun and schroeder Signed-off-by: Julien Cristau --- modules/debian-org/misc/local.yaml | 4 ---- modules/ferm/templates/me.conf.erb | 7 +------ .../templates/obsolete-packages-ignore.d-hostspecific.erb | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 777186683..dc639ef87 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -54,7 +54,6 @@ nameinfo: klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000) lamb.debian.org: John David Lamb (b. 1935) lafayette.debian.org: Eugenie Lafayette - lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791) lindsay.debian.org: Maria Lindsay Bliss (May 15th, 1827 - April 3rd, 1898) locke.debian.org: Matthew Locke (ca. 1621 - 1677) lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740) @@ -97,7 +96,6 @@ nameinfo: respighi.debian.org: Elsa Respighi (née Olivieri-Sangiacomo) (March 24th, 1894 - March 17th, 1996) samosa.debian.org: The samosa is a stuffed pastry and a popular snack in South Asia, Southeast Asia, Central Asia, the Arabian Peninsula, throughout the Mediterranean (Greece), Southwest Asia, the Horn of Africa and North Africa. santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989) - schroeder.debian.org: Hermann Schroeder (March 26th, 1904 - October 7th, 1984) schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856) sechter.debian.org: Simon Sechter (October 11th, 1788 - September 10th, 1867) seger.debian.org: Josef Seger (March 21st, 1716 - April 22nd, 1782) @@ -207,7 +205,6 @@ host_settings: - henze.debian.org - hoiby.debian.org - ia64-arm-01.debian.org - - lebrun.debian.org - lucatelli.debian.org - mayr.debian.org - mips-aql-01.debian.org @@ -228,7 +225,6 @@ host_settings: - ppc64el-osuosl-01.debian.org - ppc64el-unicamp-01.debian.org - praetorius.debian.org - - schroeder.debian.org - sompek.debian.org - spontini.debian.org - stadler.debian.org diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index d0a9aa5d2..956b52956 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -8,7 +8,7 @@ nodeinfo = scope.lookupvar('site::nodeinfo') out = [] restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost'] -restrict_ssh = %w{lebrun beethoven tchaikovsky schroeder draghi adayevskaya} +restrict_ssh = %w{beethoven tchaikovsky draghi adayevskaya} if (nodeinfo['ldap'].has_key?('purpose')) then nodeinfo['ldap']['purpose'].each do |purp| @@ -33,11 +33,6 @@ if restrict_ssh.include?(hostname) then ssh4allowed << %w{$DSA_IPS $HOST_NAGIOS_V4 $HOST_MUNIN_V4 $HOST_DB_V4} ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6 $HOST_DB_V6} - if %w{lebrun schroeder}.include?(hostname) then - out << '@def $CARNET = ( 193.198.184.8/29 161.53.160.133 161.53.160.90 161.53.11.222 161.53.12.134 161.53.12.142 161.53.12.143 );' - ssh4allowed << '$CARNET' - ssh4allowed << '$BUILDD_SSH_ACCESS' - end if %w{beethoven draghi}.include?(hostname) then ssh4allowed << '$HOST_DEBIAN_V4' ssh6allowed << '$HOST_DEBIAN_V6' diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index 3c2d75903..9f97d63f9 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -12,7 +12,7 @@ when "reger.debian.org" then ignore << %w{libr when /(rainier|rapoport).debian.org/ then ignore << %w{rabbitmq-server} when "sibelius.debian.org" then ignore << %w{tivsm-ba tivsm-bacit tivsm-api64 gskssl64 gskcrypt64 tivsm-api tivsm-apicit gskssl gskcrypt} when /(storace|backuphost).debian.org/ then ignore << %w{postgresql-client-9.1} -when /(sompek|stadler|schroeder).debian.org/ then ignore << %w{libsbuild-perl buildd sbuild} +when /(sompek|stadler).debian.org/ then ignore << %w{libsbuild-perl buildd sbuild} end ignore.flatten.join("\n") -- 2.20.1