ssh between static hosts should be handled by the ssh::authkey storedconf stuff

diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb
index 5895da3..d7360c5 100644 (file)
--- a/modules/ferm/templates/me.conf.erb
+++ b/modules/ferm/templates/me.conf.erb
@@ -45,14 +45,6 @@ if should_restrict then
                ssh6allowed << %w{$HOST_DEBIAN_V6}
        end
 
-       if scope.function_has_role(['static_master']) then
-               ssh4allowed << '$HOST_STATIC_V4'
-               ssh6allowed << '$HOST_STATIC_V6'
-       elsif scope.function_has_role(['static_source']) or
-             scope.function_has_role(['static_mirror']) then
-               ssh4allowed << '$HOST_STATICMASTER_V4'
-               ssh6allowed << '$HOST_STATICMASTER_V6'
-       end
        if scope.function_has_role(['debian_mirror']) or
           scope.function_has_role(['security_mirror']) or
           scope.function_has_role(['debug_mirror']) or