From e8b1328448828c884b998cd76ddca96826a58051 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Sat, 25 Jun 2016 20:05:34 +0200 Subject: [PATCH] beethoven has been decommissioned for a lot of time already Signed-off-by: Aurelien Jarno --- modules/ferm/templates/me.conf.erb | 4 ++-- modules/sudo/files/sudoers | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 956b52956..72e65f422 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{beethoven tchaikovsky draghi adayevskaya} +restrict_ssh = %w{tchaikovsky draghi adayevskaya} if (nodeinfo['ldap'].has_key?('purpose')) then nodeinfo['ldap']['purpose'].each do |purp| @@ -33,7 +33,7 @@ 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{beethoven draghi}.include?(hostname) then + if %w{draghi}.include?(hostname) then ssh4allowed << '$HOST_DEBIAN_V4' ssh6allowed << '$HOST_DEBIAN_V6' end diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 8159d5df5..e08de1346 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -27,7 +27,7 @@ Host_Alias WEBHOSTS = wolkenstein Host_Alias SECHOSTS = seger Host_Alias FTPHOSTS = franck Host_Alias ZIVITHOSTS = zelenka, zandonai -Host_Alias AACRAIDHOSTS = beethoven, pettersson +Host_Alias AACRAIDHOSTS = pettersson Host_Alias MEGARAIDHOSTS = rautavaara, sibelius Host_Alias MEGACTLHOSTS = nielsen Host_Alias LISTHOSTS = bendel -- 2.20.1