1 files changed, 23 insertions, 17 deletions

diff --git a/modules/profile/manifests/monitoring/commands.pp b/modules/profile/manifests/monitoring/commands.pp
index a25f7b3..4ccc816 100644
--- a/modules/profile/manifests/monitoring/commands.pp
+++ b/modules/profile/manifests/monitoring/commands.pp
@@ -3,25 +3,24 @@ class profile::monitoring::commands inherits profile::monitoring {
 
   file { "/etc/naemon/monitoring-plugins":
     ensure => "directory",
-    owner  => "naemon",
-    group  => "naemon",
-    mode   => "0700",
-  }
-
-  file { "/etc/naemon/monitoring-plugins/check_command":
-    ensure => "present",
-    owner  => "naemon",
+    owner  => "root",
     group  => "naemon",
-    mode   => "0700",
-    source => "puppet:///modules/profile/monitoring/check_command",
+    mode   => "0755",
   }
 
-  file { "/etc/naemon/monitoring-plugins/check_md_raid":
-    ensure => "present",
-    owner  => "naemon",
-    group  => "naemon",
-    mode   => "0700",
-    source => "puppet:///modules/profile/monitoring/check_md_raid",
+  [
+    "check_command",
+    "check_md_raid",
+    "check_postgres_replication",
+    "check_last_file_date",
+  ].each |$file| {
+    file { "/etc/naemon/monitoring-plugins/$file":
+      ensure => "present",
+      owner  => "root",
+      group  => "naemon",
+      mode   => "0755",
+      source => "puppet:///modules/profile/monitoring/$file",
+    }
   }
 
   Nagios_command {
@@ -48,10 +47,17 @@ class profile::monitoring::commands inherits profile::monitoring {
     "check_ntp":
       command_line => '$USER1$/check_ntp_time -H 0.arch.pool.ntp.org';
     "check_md_raid":
-      command_line => '$USER2$/check_md_raid';
+      command_line => '$USER2$/check_md_raid',
+      require      => File["/etc/naemon/monitoring-plugins/check_md_raid"];
     "check_command_output":
       command_line => '$USER2$/check_command -c "$ARG1$" -o "$ARG2$" $ARG3$',
       require      => File["/etc/naemon/monitoring-plugins/check_command"];
+    "check_postgresql_replication":
+      command_line => '/usr/bin/sudo -u postgres $USER2$/check_postgres_replication "$ARG1$" "$ARG2$" "$ARG3$"',
+      require      => File["/etc/naemon/monitoring-plugins/check_postgres_replication"];
+    "check_last_file_date":
+      command_line => '$USER2$/check_last_file_date "$ARG1$" "$ARG2$" "$ARG3$"',
+      require      => File["/etc/naemon/monitoring-plugins/check_last_file_date"],
   }
 
   unless empty($naemon_url) {