Move gombert infinoted fw into gobby role

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index db1fdeb..7668641 100644 (file)
--- 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 807db0e..2cc3c43 100644 (file)
--- 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
+  }
 }