Index: trunk/server/fedora/config/etc/nagios/check_ldap_mmr
===================================================================
--- trunk/server/fedora/config/etc/nagios/check_ldap_mmr	(revision 1271)
+++ trunk/server/fedora/config/etc/nagios/check_ldap_mmr	(revision 1272)
@@ -1,76 +1,3 @@
-#!/usr/bin/perl -w
+#!/bin/sh
 
-# Originally by Emmanuel BUU <emmanuel.buu@ives.fr> (c) IVèS 2008
-# Adapted for scripts.mit.edu by Mitchell Berger <mitchb@mit.edu>
-
-use Net::LDAP;
-use strict;
-
-# Nagios codes
-my %ERRORS=('OK'=>0, 'WARNING'=>1, 'CRITICAL'=>2, 'UNKNOWN'=>3, 'DEPENDENT'=>4);
-
-my $ldapserver = 'localhost';
-my $user = 'cn=Directory Manager';
-my $passwdfile = '/etc/signup-ldap-pw';
-my $base = "cn=config";
-my $server="nsDS5ReplicaHost";
-my $status="nsds5replicaLastUpdateStatus";
-my $laststart="nsds5replicaLastUpdateStart";
-my $lastend="nsds5replicaLastUpdateEnd";
- 
-my $ldap=ConnectLdap();
-my $result=LDAPSearch($ldap,"objectClass=nsDS5ReplicationAgreement","",$base);
-my @entries = $result->entries;
-foreach my $entr ( @entries ) {
-    my $servername=$entr->get_value($server);
-    my $serverstatus=$entr->get_value($status);
-    my $serverlaststart=$entr->get_value($laststart);
-    my $serverlastend=$entr->get_value($lastend);
-    my $statuscode = $serverstatus;
-    $statuscode =~ s/(^[-0123456789]+) (.*$)/$1/;
-    $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
-    $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
-    print "Replication to $servername last operation $serverlaststart ";
-    print "Status: $serverstatus.\n";
-    if ($statuscode) {
-        &nagios_return("ERROR", "Replication error: " . $serverstatus);
-    }
-}
-&nagios_return("OK", "All replicas are OK");
-
-sub ConnectLdap {
-    my $ldap = Net::LDAP->new ( $ldapserver ) or die "$@";
-    open (PASSWD, $passwdfile) || &nagios_return("CRITICAL", "Could not read credentials");
-    my $passwd = <PASSWD>;
-    close (PASSWD);
-    my $mesg = $ldap->bind ( "$user", password => "$passwd" , version => 3 );
-    if ($mesg->code) {
-        &nagios_return("CRITICAL", "Failed to bind to LDAP: " . $mesg->error);
-    }
-    return $ldap;
-}
-
-sub LDAPSearch {
-    my ($ldap,$searchString,$attrs,$base) = @_;
-    my $result = $ldap->search ( base    => "$base",
-                                 scope   => "sub",
-                                 filter  => "$searchString",
-                                 attrs   =>  $attrs
-                               );
-}
-
-sub nagios_return($$) {
-    my ($ret, $message) = @_;
-    my ($retval, $retstr);
-    if (defined($ERRORS{$ret})) {
-        $retval = $ERRORS{$ret};
-        $retstr = $ret;
-    } else {
-        $retstr = 'UNKNOWN';
-        $retval = $ERRORS{$retstr};
-    }
-    $message = "$retstr - $message\n";
-    print $message;
-    exit $retval;
-}
-
+exec /usr/bin/sudo -u signup /etc/nagios/check_ldap_mmr.real
Index: trunk/server/fedora/config/etc/nagios/check_ldap_mmr.real
===================================================================
--- trunk/server/fedora/config/etc/nagios/check_ldap_mmr.real	(revision 1272)
+++ trunk/server/fedora/config/etc/nagios/check_ldap_mmr.real	(revision 1272)
@@ -0,0 +1,76 @@
+#!/usr/bin/perl -w
+
+# Originally by Emmanuel BUU <emmanuel.buu@ives.fr> (c) IVèS 2008
+# Adapted for scripts.mit.edu by Mitchell Berger <mitchb@mit.edu>
+
+use Net::LDAP;
+use strict;
+
+# Nagios codes
+my %ERRORS=('OK'=>0, 'WARNING'=>1, 'CRITICAL'=>2, 'UNKNOWN'=>3, 'DEPENDENT'=>4);
+
+my $ldapserver = 'localhost';
+my $user = 'cn=Directory Manager';
+my $passwdfile = '/etc/signup-ldap-pw';
+my $base = "cn=config";
+my $server="nsDS5ReplicaHost";
+my $status="nsds5replicaLastUpdateStatus";
+my $laststart="nsds5replicaLastUpdateStart";
+my $lastend="nsds5replicaLastUpdateEnd";
+ 
+my $ldap=ConnectLdap();
+my $result=LDAPSearch($ldap,"objectClass=nsDS5ReplicationAgreement","",$base);
+my @entries = $result->entries;
+foreach my $entr ( @entries ) {
+    my $servername=$entr->get_value($server);
+    my $serverstatus=$entr->get_value($status);
+    my $serverlaststart=$entr->get_value($laststart);
+    my $serverlastend=$entr->get_value($lastend);
+    my $statuscode = $serverstatus;
+    $statuscode =~ s/(^[-0123456789]+) (.*$)/$1/;
+    $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
+    $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
+    print "Replication to $servername last operation $serverlaststart ";
+    print "Status: $serverstatus.\n";
+    if ($statuscode) {
+        &nagios_return("ERROR", "Replication error: " . $serverstatus);
+    }
+}
+&nagios_return("OK", "All replicas are OK");
+
+sub ConnectLdap {
+    my $ldap = Net::LDAP->new ( $ldapserver ) or die "$@";
+    open (PASSWD, $passwdfile) || &nagios_return("CRITICAL", "Could not read credentials");
+    my $passwd = <PASSWD>;
+    close (PASSWD);
+    my $mesg = $ldap->bind ( "$user", password => "$passwd" , version => 3 );
+    if ($mesg->code) {
+        &nagios_return("CRITICAL", "Failed to bind to LDAP: " . $mesg->error);
+    }
+    return $ldap;
+}
+
+sub LDAPSearch {
+    my ($ldap,$searchString,$attrs,$base) = @_;
+    my $result = $ldap->search ( base    => "$base",
+                                 scope   => "sub",
+                                 filter  => "$searchString",
+                                 attrs   =>  $attrs
+                               );
+}
+
+sub nagios_return($$) {
+    my ($ret, $message) = @_;
+    my ($retval, $retstr);
+    if (defined($ERRORS{$ret})) {
+        $retval = $ERRORS{$ret};
+        $retstr = $ret;
+    } else {
+        $retstr = 'UNKNOWN';
+        $retval = $ERRORS{$retstr};
+    }
+    $message = "$retstr - $message\n";
+    print $message;
+    exit $retval;
+}
+
Index: trunk/server/fedora/config/etc/sudoers
===================================================================
--- trunk/server/fedora/config/etc/sudoers	(revision 1271)
+++ trunk/server/fedora/config/etc/sudoers	(revision 1272)
@@ -71,4 +71,5 @@
 scripts	ALL=(signup)	NOPASSWD: /usr/local/bin/ldap-backup
 rebecca	ALL=(root)	NOPASSWD: /sbin/service nscd restart
+nrpe	ALL=(signup)	NOPASSWD: /etc/nagios/check_ldap_mmr.real
 
 Defaults:munin !syslog
Index: trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl
===================================================================
--- trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 1271)
+++ trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 1272)
@@ -119,4 +119,5 @@
 	} elsif ($message =~ m|^Transferred: sent \d+, received \d+ bytes$|) {
 	} elsif ($message =~ m|^Setting tty modes failed: Invalid argument$|) {
+	} elsif ($message =~ m|^ *nrpe .* COMMAND=/etc/nagios/check_ldap_mmr.real$|) {
 	} else {
 	    sendmsg($message, "scripts-spew");