Revert "ferm: open ssh from mirror-master to ports mirror"

[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 63268d6..072c2c0 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,11 +4,11 @@
 ##
 
 <%=
-nodeinfo = scope.lookupvar('site::nodeinfo')
+nodeinfo = scope.lookupvar('deprecated::nodeinfo')
 out = []
 
-restricted_purposes = ['kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'anycast mirror', 'static-mirror']
-restrict_ssh = %w{tchaikovsky draghi adayevskaya}
+restricted_purposes = ['kvm host', 'ganeti/kvm host', 'central syslog server', 'puppet master', 'jumphost', 'buildd', 'static-mirror', 'anycast mirror']
+restrict_ssh = %w{tchaikovsky draghi adayevskaya static-master-grnet-01 static-master-ubc-01 geo1 geo2 geo3 denis}
 
 if (nodeinfo['ldap'].has_key?('purpose')) then
        nodeinfo['ldap']['purpose'].each do |purp|
@@ -22,16 +22,12 @@ ssh4allowed = []
 ssh6allowed = []
 
 should_restrict = restrict_ssh.include?(@hostname)
-%w{dns_primary dns_geo}.each do |role_restrict|
-       if scope.function_has_role([role_restrict]) then
-               should_restrict = true
-       end
-end
 
 
-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 should_restrict then
+       # draghi makes for a nice jumphost
+       ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4 $HOST_MUNIN_V4  82.195.75.106}
+       ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6 $HOST_MUNIN_V6  2001:41b8:202:deb:1a1a:0:52c3:4b6a}
 
        if %w{draghi}.include?(@hostname) then
                ssh4allowed << '$HOST_DEBIAN_V4'
@@ -44,27 +40,45 @@ if restrict_ssh.include?(@hostname) then
                ssh4allowed << %w{$HOST_DEBIAN_V4}
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end
-       if scope.function_has_role(['dns_primary']) then
-               ssh4allowed << "5.153.231.5" # adayevskaya
-               ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-               #ssh4allowed << "$HOST_DNS_GEO_V4"
-               #ssh6allowed << "$HOST_DNS_GEO_V6"
-       end
 
-       if scope.function_has_role(['static_master']) then
-               ssh4allowed << '$HOST_STATIC_V4'
-               ssh6allowed << '$HOST_STATIC_V6'
-       elsif scope.function_has_role(['static_source']) or
-             scope.function_has_role(['static_mirror']) then
-               ssh4allowed << '$HOST_STATICMASTER_V4'
-               ssh6allowed << '$HOST_STATICMASTER_V6'
+       if scope.function_has_role(['debian_mirror']) or
+          scope.function_has_role(['security_mirror']) or
+          scope.function_has_role(['debug_mirror']) or
+          scope.function_has_role(['historical_mirror']) or
+          scope.function_has_role(['syncproxy']) then
+               ssh4allowed << '$HOST_MIRRORMASTER_V4'
+               ssh6allowed << '$HOST_MIRRORMASTER_V6'
+       end
+       if scope.function_has_role(['debian_mirror']) or
+          scope.function_has_role(['syncproxy']) then
+               ssh4allowed << '$HOST_SYNCPROXY_V4'
+               ssh6allowed << '$HOST_SYNCPROXY_V6'
+       end
+       if scope.function_has_role(['security_mirror']) or
+          scope.function_has_role(['syncproxy']) then
+               ssh4allowed << '$HOST_SECMASTER_V4'
+               ssh6allowed << '$HOST_SECMASTER_V6'
+       end
+       if scope.function_has_role(['historical_mirror']) then
+               ssh4allowed << '$HOST_ARCHIVEMASTER_V4'
+               ssh6allowed << '$HOST_ARCHIVEMASTER_V6'
+       end
+       if scope.function_has_role(['syncproxy']) then
+               ssh4allowed << '$HOST_FTPMASTER_V4'
+               ssh6allowed << '$HOST_FTPMASTER_V6'
+               ssh4allowed << '$HOST_PORTSMASTER_V4'
+               ssh6allowed << '$HOST_PORTSMASTER_V6'
+       end
+       if scope.function_has_role(['debug_mirror']) then
+               ssh4allowed << '$HOST_FTPMASTER_V4'
+               ssh6allowed << '$HOST_FTPMASTER_V6'
        end
 end
 ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
 ssh6allowed.length == 0 and ssh6allowed << '::/0'
 
-out << "@def $SSH_SOURCES    = (#{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = (#{ssh6allowed.join(' ')});"
+out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
+out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"