Fixes

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index bc603b7e214ac8ed6b9ba14ba8c31f072dd7369c..49c6eedc2901d8df6d6ecd127f35cc9ba7b6d187 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -24,7 +24,7 @@
   allnodeinfo = scope.lookupvar('site::allnodeinfo')
   roles = scope.lookupvar('site::roles')
 
-  %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master dns_secondary}.each do |role|
+  %w{mailrelay nagiosmaster extranrpeclient muninmaster dbmaster static_mirror static_source static_master dns_secondary dns_geo}.each do |role|
     rolehost[role] = []
     roles[role].each do |node|
         rolehost[role] << allnodeinfo[node]['ipHostNumber']

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 9a7dd8b01edacfd9f9078050754fbbd6e0b03a1d..d892a6c3d78515349ceaee30c735bfeed7fbf8b3 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -23,7 +23,9 @@ ssh6allowed = []
 
 should_restrict = restrict_ssh.include?(hostname)
 %w{dns_primary dns_geo}.each do |role_restrict|
-       if scope.function_has_role([role_restrict]) then should_restrict = true
+       if scope.function_has_role([role_restrict]) then
+               should_restrict = true
+       end
 end
 
 
@@ -48,8 +50,8 @@ if restrict_ssh.include?(hostname) then
        if scope.function_has_role(['dns_primary']) then
                ssh4allowed << "5.153.231.5" # adayevskaya
                ssh6allowed << "2001:41c8:1000:21::21:5" # adayevskaya
-               ssh4allowed << "$HOST_DNS_GEO_V4"
-               ssh6allowed << "$HOST_DNS_GEO_V6"
+               #ssh4allowed << "$HOST_DNS_GEO_V4"
+               #ssh6allowed << "$HOST_DNS_GEO_V6"
        end
 
        if scope.function_has_role(['static_master']) then