From 97669532c8d024b55d005dfa3cda683acfd622be Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 30 Sep 2019 08:16:14 +0200 Subject: [PATCH] Move gombert infinoted fw into gobby role --- modules/ferm/manifests/per_host.pp | 7 ------- modules/roles/manifests/gobby.pp | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp index db1fdeb1f..7668641b8 100644 --- a/modules/ferm/manifests/per_host.pp +++ b/modules/ferm/manifests/per_host.pp @@ -10,13 +10,6 @@ class ferm::per_host { rule => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))' } } - gombert: { - ferm::rule { 'dsa-infinoted': - domain => '(ip ip6)', - description => 'Allow infinoted access', - rule => '&SERVICE(tcp, 6523)' - } - } draghi: { ferm::rule { 'dsa-finger': domain => '(ip ip6)', diff --git a/modules/roles/manifests/gobby.pp b/modules/roles/manifests/gobby.pp index 807db0e6b..2cc3c43cb 100644 --- a/modules/roles/manifests/gobby.pp +++ b/modules/roles/manifests/gobby.pp @@ -17,4 +17,8 @@ class roles::gobby { command => 'pkill -u gobby -HUP -x infinoted', refreshonly => true, } + + ferm::rule::simple { 'infinoted': + port => 6523 + } } -- 2.20.1