diff -Naur -x '*~' -x '*.orig' -x '*.rej' ndoutils-2.0.0/config/misccommands.cfg.in ndoutils-2.0.0-mageia-config/config/misccommands.cfg.in --- ndoutils-2.0.0/config/misccommands.cfg.in 2014-02-28 19:13:22.000000000 +0100 +++ ndoutils-2.0.0-mageia-config/config/misccommands.cfg.in 2014-08-05 11:33:51.343391141 +0200 @@ -7,5 +7,5 @@ define command{ command_name rotate_ndo_log - command_line /bin/mv @localstatedir@/ndo.dat @localstatedir@/ndo.`date +%s` + command_line /bin/mv @localstatedir@/lib/ndo/ndo.dat @localstatedir@/lib/ndo/ndo.`date +%s` } diff -Naur -x '*~' -x '*.orig' -x '*.rej' ndoutils-2.0.0/config/nagios.cfg.in ndoutils-2.0.0-mageia-config/config/nagios.cfg.in --- ndoutils-2.0.0/config/nagios.cfg.in 2014-02-28 19:13:22.000000000 +0100 +++ ndoutils-2.0.0-mageia-config/config/nagios.cfg.in 2014-08-05 11:35:55.942942488 +0200 @@ -5,10 +5,10 @@ # 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=@bindir@/ndomod-2x.o config_file=@sysconfdir@/ndomod.cfg +#broker_module=@libdir@/nagios/brokers/ndomod-2x.o config_file=@sysconfdir@/nagios/ndomod.cfg # Uncomment the line below if you're running Nagios 3.x -#broker_module=@bindir@/ndomod-3x.o config_file=@sysconfdir@/ndomod.cfg +#broker_module=@libdir@/nagios/brokers/ndomod-3x.o config_file=@sysconfdir@/nagios/ndomod.cfg # Uncomment the line below if you're running Nagios 4.x -#broker_module=@bindir@/ndomod-4x.o config_file=@sysconfdir@/ndomod.cfg +#broker_module=@libdir@/nagios/brokers/ndomod-4x.o config_file=@sysconfdir@/nagios/ndomod.cfg diff -Naur -x '*~' -x '*.orig' -x '*.rej' ndoutils-2.0.0/config/ndo2db.cfg-sample.in ndoutils-2.0.0-mageia-config/config/ndo2db.cfg-sample.in --- ndoutils-2.0.0/config/ndo2db.cfg-sample.in 2014-02-28 19:13:22.000000000 +0100 +++ ndoutils-2.0.0-mageia-config/config/ndo2db.cfg-sample.in 2014-08-05 11:33:51.344391161 +0200 @@ -10,7 +10,7 @@ # This is the lockfile that NDO2DB will use to store its PID number # in when it is running in daemon mode. -lock_file=@localstatedir@/ndo2db.lock +lock_file=/run/ndo2db/ndo2db.pid @@ -41,7 +41,7 @@ # This option is only valid if the socket type specified above # is "unix". -socket_name=@localstatedir@/ndo.sock +socket_name=@localstatedir@/lib/ndo/ndo.sock @@ -191,7 +191,7 @@ # DEBUG FILE # This option determines where the daemon should write debugging information. -debug_file=@localstatedir@/ndo2db.debug +debug_file=@localstatedir@/log/nagios/ndo2db.debug diff -Naur -x '*~' -x '*.orig' -x '*.rej' ndoutils-2.0.0/config/ndomod.cfg-sample.in ndoutils-2.0.0-mageia-config/config/ndomod.cfg-sample.in --- ndoutils-2.0.0/config/ndomod.cfg-sample.in 2014-02-28 19:13:22.000000000 +0100 +++ ndoutils-2.0.0-mageia-config/config/ndomod.cfg-sample.in 2014-08-05 11:33:51.344391161 +0200 @@ -37,7 +37,7 @@ #output=@localstatedir@/ndo.dat #output=127.0.0.1 -output=@localstatedir@/ndo.sock +output=@localstatedir@/lib/ndo/ndo.sock @@ -82,7 +82,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=@localstatedir@/ndomod.tmp +buffer_file=@localstatedir@/lib/ndo/ndomod.tmp