X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=5a1390745056c80531c57b9b46fe76df3f6e35a7;hb=bf8fb059cf46f8c8a74b55b970b97038925dc75b;hp=0ed5c0f07d2c25489f9497dae95973cb0ea8635f;hpb=167d6174e2c588d46666bae9545c114d3da1903a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 0ed5c0f07..5a1390745 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -4,9 +4,32 @@
 ##
 
 
-@def $SSH_SOURCES = <%
-ssh_allowed = case hostname
-  when 'logtest01' then '0.0.0.0/0'
+@def $SSH_SOURCES = (<%=
+
+sshallowed = []
+
+case hostname
+  when 'logtest01' then sshallowed << [ '$DSA_IPS' ]
+end
+
+if sshallowed.length == 0
+  sshallowed = [ '0.0.0.0' ]
+end
+
+sshallowed.join(' ')
+%>);
+
+@def $SSH_V6_SOURCES = (<%=
+
+sshallowed = []
+
+case hostname
+  when 'logtest01' then sshallowed << [ '$DSA_V6_IPS' ]
 end
-ssh_allowed
-%>
+
+if sshallowed.length == 0
+  sshallowed = [ ':::' ]
+end
+
+sshallowed.join(' ')
+%>);