merge SSH_SOURCES and SSH_V6_SOURCES

[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 33d0335..ef3b550 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -18,34 +18,30 @@ if (nodeinfo['ldap'].has_key?('purpose')) then
        end
 end
 
-ssh4allowed = []
-ssh6allowed = []
+sshallowed = []
 
 should_restrict = restrict_ssh.include?(@hostname)
 
-
 if should_restrict then
        # draghi makes for a nice jumphost
-       ssh4allowed << %w{$DSA_IPS    $HOST_NAGIOS_V4   82.195.75.106}
-       ssh6allowed << %w{$DSA_V6_IPS $HOST_NAGIOS_V6   2001:41b8:202:deb:1a1a:0:52c3:4b6a}
+       sshallowed << %w{$DSA_IPS 82.195.75.106 2001:41b8:202:deb:1a1a:0:52c3:4b6a}
 
        if %w{draghi}.include?(@hostname) then
-               ssh4allowed << '$HOST_DEBIAN_V4'
-               ssh6allowed << '$HOST_DEBIAN_V6'
+               sshallowed << '$HOST_DEBIAN'
        end
 
        if %w{adayevskaya}.include?(@hostname) then
-                out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
-                ssh4allowed << '$MFL_LOCAL'
-               ssh4allowed << %w{$HOST_DEBIAN_V4}
-               ssh6allowed << %w{$HOST_DEBIAN_V6}
+               out << '@def $MFL_LOCAL = ( 130.83.226.60 );' # Michael Fladerer
+               sshallowed << '$MFL_LOCAL'
+               sshallowed << %w{$HOST_DEBIAN}
        end
 end
-ssh4allowed.length == 0 and ssh4allowed << '0.0.0.0/0'
-ssh6allowed.length == 0 and ssh6allowed << '::/0'
+if sshallowed.length == 0 then
+  sshallowed << '0.0.0.0/0'
+  sshallowed << '::/0'
+end
 
-out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{ssh4allowed.join(' ')});"
-out << "@def $SSH_V6_SOURCES = ( $SSH_V6_SOURCES #{ssh6allowed.join(' ')});"
+out << "@def $SSH_SOURCES    = ( $SSH_SOURCES    #{sshallowed.join(' ')});"
 
 
 out.join("\n")