From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 30 Sep 2019 06:16:14 +0000 (+0200)
Subject: Move gombert infinoted fw into gobby role
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=97669532c8d024b55d005dfa3cda683acfd622be;hp=1dee729d00307f93d600b5bb6902494bd30a4484;p=mirror%2Fdsa-puppet.git

Move gombert infinoted fw into gobby role
---

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
+  }
 }