From c46c2232c05322f2fc2f0d55fcc2c9838c267306 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 11 Sep 2019 10:31:19 +0200 Subject: [PATCH] ssh between static hosts should be handled by the ssh::authkey storedconf stuff --- modules/ferm/templates/me.conf.erb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index 5895da3f4..d7360c573 100644 --- 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 -- 2.20.1