X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Fmanifests%2Fserver.pp;h=a67e17edd43bad2a6da8131f0f3d1b792bd23c4a;hb=6605aa629b31ed231c2dbf29c8b2f4c8585e2de7;hp=2e7b1eba0ed8a202fb108bf65605817716f26e3a;hpb=1f37c1198a12c740639535f69d3f42b841c0aca5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/manifests/server.pp b/modules/nagios/manifests/server.pp
index 2e7b1eba0..a67e17edd 100644
--- a/modules/nagios/manifests/server.pp
+++ b/modules/nagios/manifests/server.pp
@@ -162,4 +162,18 @@ class nagios::server {
     target  => '/etc/nagios/nrpe.d/debianorg.cfg',
     content => "allowed_hosts=${ $base::public_addresses.join(', ') }",
   }
+  # and we want to monitor smtp servers
+  @@ferm::rule::simple { "dsa-smtp-from-nagios-${::fqdn}":
+    tag         => 'smtp::server::to::mail-satellite',
+    description => 'Allow smtp access from the nagios server',
+    port        => '7', # will be overwritten on collection
+    saddr       => $base::public_addresses,
+  }
+  # and we want to monitor ssh
+  @@ferm::rule::simple { "dsa-ssh-from-nagios-${::fqdn}":
+    tag         => 'ssh::server::from::nagios',
+    description => 'Allow ssh access from the nagios server',
+    chain       => 'ssh',
+    saddr       => $base::public_addresses,
+  }
 }