add geo1

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index d6ec89f64b6087c2a07bc31f57d50b07764336fb..b0c9d7a1df3b26a1e621b28fa54387ee8292841d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -82,7 +82,7 @@ node default {
     }
 
     case $hostname {
-        logtest01: { include ferm }
+        logtest01,geo1: { include ferm }
     }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 8c3c234e02267799e1bb34a6323275e92dc15b00..6ae7696b256ab53a5d9a9cafd4b1fb4c18ae59ed 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -9,7 +9,7 @@
 sshallowed = []
 
 case hostname
-  when 'logtest01' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
+  when 'logtest01', 'geo1' then sshallowed << [ '$DSA_IPS', '$HOST_NAGIOS_V4', '$HOST_DB_V4' ]
 end
 
 if sshallowed.length == 0
@@ -24,7 +24,7 @@ sshallowed.join(' ')
 sshallowed = []
 
 case hostname
-  when 'logtest01' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
+  when 'logtest01', 'geo1' then sshallowed << [ '$DSA_V6_IPS', '$HOST_NAGIOS_V6', '$HOST_DB_V6' ]
 end
 
 if sshallowed.length == 0