diff -Naur --exclude '*~' ndoutils-1.4b7/config/misccommands.cfg ndoutils-1.4b7-mdv-config/config/misccommands.cfg
--- ndoutils-1.4b7/config/misccommands.cfg 2007-01-08 01:35:58.000000000 +0100
+++ ndoutils-1.4b7-mdv-config/config/misccommands.cfg 2007-12-17 17:31:53.000000000 +0100
@@ -7,5 +7,5 @@
define command{
command_name rotate_ndo_log
- command_line /bin/mv /usr/local/nagios/var/ndo.dat /usr/local/nagios/var/ndo.`date +%s`
+ command_line /bin/mv /var/lib/ndo/ndo.dat /var/lib/ndo/ndo.`date +%s`
}
diff -Naur --exclude '*~' ndoutils-1.4b7/config/nagios.cfg ndoutils-1.4b7-mdv-config/config/nagios.cfg
--- ndoutils-1.4b7/config/nagios.cfg 2007-01-08 01:35:58.000000000 +0100
+++ ndoutils-1.4b7-mdv-config/config/nagios.cfg 2007-12-17 17:31:53.000000000 +0100
@@ -4,8 +4,5 @@
# to place a statement like the one found below in your main Nagios
# configuration file (nagios.cfg). Adjust the paths, etc. to suit your needs.
-# Uncomment the line below if you're running Nagios 2.x
-broker_module=/usr/local/nagios/bin/ndomod-2x.o config_file=/usr/local/nagios/etc/ndomod.cfg
-
# Uncomment the line below if you're running Nagios 3.x
-#broker_module=/usr/local/nagios/bin/ndomod-3x.o config_file=/usr/local/nagios/etc/ndomod.cfg
+broker_module=/usr/lib/nagios/brokers/ndomod.o config_file=/etc/nagios/ndomod.cfg
diff -Naur --exclude '*~' ndoutils-1.4b7/config/ndo2db.cfg ndoutils-1.4b7-mdv-config/config/ndo2db.cfg
--- ndoutils-1.4b7/config/ndo2db.cfg 2007-10-31 19:17:04.000000000 +0100
+++ ndoutils-1.4b7-mdv-config/config/ndo2db.cfg 2007-12-17 17:32:29.000000000 +0100
@@ -32,7 +32,7 @@
# This option is only valid if the socket type specified above
# is "unix".
-socket_name=/usr/local/nagios/var/ndo.sock
+socket_name=/var/lib/ndo/ndo.sock
@@ -152,7 +152,7 @@
# DEBUG FILE
# This option determines where the daemon should write debugging information.
-debug_file=@localstatedir@/ndo2db.debug
+debug_file=/var/log/nagios/ndo2db.log
diff -Naur --exclude '*~' ndoutils-1.4b7/config/ndomod.cfg ndoutils-1.4b7-mdv-config/config/ndomod.cfg
--- ndoutils-1.4b7/config/ndomod.cfg 2007-09-27 18:47:44.000000000 +0200
+++ ndoutils-1.4b7-mdv-config/config/ndomod.cfg 2007-12-17 17:31:53.000000000 +0100
@@ -35,9 +35,9 @@
# of fully qualified domain name of the host that the module should
# connect to for sending output.
-#output=/usr/local/nagios/var/ndo.dat
+#output=/var/lib/ndo/ndo.dat
#output=127.0.0.1
-output=/usr/local/nagios/var/ndo.sock
+output=/var/lib/ndo/ndo.sock
@@ -68,7 +68,7 @@
# Nagios (re)starts, the NDO NEB module will read the contents of this
# file and send it to the NDO2DB daemon for processing.
-buffer_file=/usr/local/nagios/var/ndomod.tmp
+buffer_file=/var/lib/ndo/ndomod.tmp
