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

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 5a1390745..765363d15 100644
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -9,11 +9,11 @@
 sshallowed = []
 
 case hostname
-  when 'logtest01' then sshallowed << [ '$DSA_IPS' ]
+  when 'logtest01', 'geo1', then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
 end
 
 if sshallowed.length == 0
-  sshallowed = [ '0.0.0.0' ]
+  sshallowed = [ '0.0.0.0/0' ]
 end
 
 sshallowed.join(' ')
@@ -24,11 +24,11 @@ sshallowed.join(' ')
 sshallowed = []
 
 case hostname
-  when 'logtest01' then sshallowed << [ '$DSA_V6_IPS' ]
+  when 'logtest01', 'geo1', 'geo2', 'geo3' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
 end
 
 if sshallowed.length == 0
-  sshallowed = [ ':::' ]
+  sshallowed = [ '::' ]
 end
 
 sshallowed.join(' ')