restrict ssh to static-master-grnet-01 by default. we really should move this config...

[mirror/dsa-puppet.git] / modules / ferm / templates / me.conf.erb

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0d4ed33..f82aa46 100644 (file)
--- 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', 'ganeti/kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
-restrict_ssh = %w{tchaikovsky draghi adayevskaya}
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
        nodeinfo['ldap']['purpose'].each do |purp|
@@ -29,7 +29,7 @@ should_restrict = restrict_ssh.include?(@hostname)
 end
 
 
-if restrict_ssh.include?(@hostname) then
+if should_restrict 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}
 
@@ -44,16 +44,6 @@ if restrict_ssh.include?(@hostname) then
                ssh4allowed << %w{$HOST_DEBIAN_V4}
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end
-       if scope.function_has_role(['puppetmaster']) then
-               ssh4allowed << "82.195.75.75" # adayevskaya
-               ssh6allowed << "2001:41b8:202:deb:1b1b::75" # adayevskaya
-       end
-       if scope.function_has_role(['dns_primary']) then
-               ssh4allowed << "82.195.75.75" # adayevskaya
-               ssh6allowed << "2001:41b8:202:deb:1b1b::75" # adayevskaya
-               #ssh4allowed << "$HOST_DNS_GEO_V4"
-               #ssh6allowed << "$HOST_DNS_GEO_V6"
-       end
 
        if scope.function_has_role(['static_master']) then
                ssh4allowed << '$HOST_STATIC_V4'