X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fclient.pp;h=a2a7c24d81554946da7208d774e4f88566da7b68;hb=3da3099c18259b8a9a13fdaa3653cf7e88ae09fc;hp=710378c5a963b5f4d34c6fd952b00b68bd9c0c91;hpb=4fd2a89f6e76cf67ba3ddd1ca6b512c2b4501be8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/client.pp b/modules/nagios/manifests/client.pp
index 710378c5a..a2a7c24d8 100644
--- a/modules/nagios/manifests/client.pp
+++ b/modules/nagios/manifests/client.pp
@@ -13,17 +13,7 @@ class nagios::client inherits nagios {
     pattern   => 'nrpe',
   }
 
-  ferm::rule { 'dsa-nagios-v4':
-    description => 'Allow nrpe from nagios master',
-    rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V4) ACCEPT; }',
-    notarule    => true,
-  }
-  ferm::rule { 'dsa-nagios-v6':
-    description => 'Allow nrpe from nagios master',
-    domain      => 'ip6',
-    rule        => 'proto tcp mod state state (NEW) dport (5666) @subchain \'nagios\' { saddr ($HOST_NAGIOS_V6) ACCEPT; }',
-    notarule    => true,
-  }
+  Ferm::Rule::Simple <<| tag == 'nagios-nrpe::server' |>>
 
   file { '/etc/default/nagios-nrpe-server':
     source  => 'puppet:///modules/nagios/common/default',