X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Ftemplates%2Fme.conf.erb;h=20edce92606a85061ec2f941b204e2985bbc3d31;hb=e1b0adaaa36ee0c5de7e7512a04247778850b164;hp=4c12bd55e7dd289562aaf4c4dc3bebce78509f2f;hpb=4b22086f6f79221555bcaab12b4553ae232b8f9d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 4c12bd55e..20edce926 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -9,11 +9,34 @@
 sshallowed = []
 
 case hostname
-  when 'logtest01' then sshallowed << [ '$DSA_IPS' ]
+  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+end
+
+case hostname
+  when 'bartok' then sshallowed << '$HOST_DEBIAN_V4'
+end
+
+if sshallowed.length == 0
+  sshallowed = [ '0.0.0.0/0' ]
+end
+
+sshallowed.join(' ')
+%>);
+
+@def $SSH_V6_SOURCES = (<%=
+
+sshallowed = []
+
+case hostname
+  when 'logtest01', 'geo1', 'geo2', 'geo3', 'bartok' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+end
+
+case hostname
+  when 'bartok' then sshallowed << '$HOST_DEBIAN_V6'
 end
 
 if sshallowed.length == 0
-  sshallowed = [ '0.0.0.0' ]
+  sshallowed = [ '::' ]
 end
 
 sshallowed.join(' ')