Revert "unrestrict geo2,3, take 2"

[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 a7729e996860d9c95fd32011b333e17c21bf94f4..765363d1579fa6d5a7e209538456beacf111ab5d 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -5,9 +5,31 @@
 
 
 @def $SSH_SOURCES = (<%=
+
+sshallowed = []
+
+case hostname
+  when 'logtest01', 'geo1', then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+end
+
+if sshallowed.length == 0
+  sshallowed = [ '0.0.0.0/0' ]
+end
+
+sshallowed.join(' ')
+%>);
+
+@def $SSH_V6_SOURCES = (<%=
+
 sshallowed = []
+
 case hostname
-  when 'logtest01' then sshallowed << [ '91.103.132.25', '91.103.132.49' ]
+  when 'logtest01', 'geo1', 'geo2', 'geo3' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+end
+
+if sshallowed.length == 0
+  sshallowed = [ '::' ]
 end
+
 sshallowed.join(' ')
 %>);