[Nagios-devel] [PATCH] NDOUtils - minor fixes to configure and

Support forum for Nagios Core, Nagios Plugins, NCPA, NRPE, NSCA, NDOUtils and more. Engage with the community of users including those using the open source solutions.
Locked
Guest

[Nagios-devel] [PATCH] NDOUtils - minor fixes to configure and

Post by Guest »

This is a multi-part message in MIME format.
--------------000600060102040307040708
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Devels,
hi list,

attached a complete patch against the latest NDOUtils CVS Code.

Why that?
This small changes takes care of the 'configure' evaluated paths and
takes them over to the default config files.

Why so much input?
I did some work on the seperate conf files (recognize paths), changed
the root-Makefile (to delete them on distclean), tuned up the
configure.in (find perl via autoconf and use it for 'subst') and rebuild
the configure script with autoconf 2.59 (same version as before).

@Packagebuilders out there:
Please let me now if there are more things to do for building NDOUtils
Packages.

Regards,
Hendrik
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (Darwin)

iEYEARECAAYFAkkW9VoACgkQlI0PwfxLQjlhmgCdEU3OHKxeEYr4jaht6NJkghJW
fTUAnAyOhnSd2GFPZAGG3Gi9IlyvzZxM
=hrJC
-----END PGP SIGNATURE-----

--------------000600060102040307040708
Content-Type: text/x-patch;
name="33cfe8a5b8a6396793e16c3d088aa0c7211a8653.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="33cfe8a5b8a6396793e16c3d088aa0c7211a8653.diff"

diff --git a/Makefile.in b/Makefile.in
index 328bf94..b408a29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,6 +22,7 @@ distclean: clean
rm -f config.log config.status config.cache $(SRC_INCLUDE)/config.h
rm -f Makefile
rm -f init-script.suse subst
+ rm -f config/ndo2db.cfg config/ndomod.cfg config/nagios.cfg config/misccommands.cfg

devclean: distclean

diff --git a/config/misccommands.cfg b/config/misccommands.cfg
deleted file mode 100644
index 6f6d46d..0000000
--- a/config/misccommands.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# SAMPLE NDO FILE ROTATION COMMAND
-#
-# This is an example Nagios command definition that can be used to
-# rotate the NDO output file on a regular basis. Adjust the paths, etc.
-# to suit your needs. This definition will need to be included in your
-# Nagios config files if you want to use it.
-
-define command{
- command_name rotate_ndo_log
- command_line /bin/mv /usr/local/nagios/var/ndo.dat /usr/local/nagios/var/ndo.`date +%s`
- }
diff --git a/config/misccommands.cfg.in b/config/misccommands.cfg.in
new file mode 100644
index 0000000..48df0a1
--- /dev/null
+++ b/config/misccommands.cfg.in
@@ -0,0 +1,11 @@
+# SAMPLE NDO FILE ROTATION COMMAND
+#
+# This is an example Nagios command definition that can be used to
+# rotate the NDO output file on a regular basis. Adjust the paths, etc.
+# to suit your needs. This definition will need to be included in your
+# Nagios config files if you want to use it.
+
+define command{
+ command_name rotate_ndo_log
+ command_line /bin/mv @localstatedir@/ndo.dat @localstatedir@/ndo.`date +%s`
+ }
diff --git a/config/nagios.cfg b/config/nagios.cfg
deleted file mode 100644
index 2c52c4b..0000000
--- a/config/nagios.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# SAMPLE NAGIOS CONFIG SNIPPET FOR NDOMOD
-#
-# In order to have Nagios run the NDOMOD event broker module, you'll need
-# 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
diff --git a/config/nagios.cfg.in b/config/nagios.cfg.in
new file mode 100644
index 0000000..7585daa
--- /dev/null
+++ b/config/nagios.cfg.in
@@ -0,0 +1,11 @@
+# SAMPLE NAGIOS CONFIG SNIPPET FOR NDOMOD
+#
+# In order to have Nagios run the NDOMOD event broker module, you'll need
+# 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_modul

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]
Locked