[csw-devel] SF.net SVN: gar:[3804] csw/mgar/pkg/nrpe/trunk

Wed Mar 18 17:22:03 CET 2009

Revision: 3804
          http://gar.svn.sourceforge.net/gar/?rev=3804&view=rev
Author:   j_arndt
Date:     2009-03-18 16:22:03 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
nrpe: fixed paths, typo, improved start script

Modified Paths:
--------------
    csw/mgar/pkg/nrpe/trunk/Makefile
    csw/mgar/pkg/nrpe/trunk/checksums
    csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec
    csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype
    csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec
    csw/mgar/pkg/nrpe/trunk/files/cswnrpe

Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================

--- csw/mgar/pkg/nrpe/trunk/Makefile	2009-03-18 16:00:07 UTC (rev 3803)
+++ csw/mgar/pkg/nrpe/trunk/Makefile	2009-03-18 16:22:03 UTC (rev 3804)
@@ -2,7 +2,9 @@
 GARVERSION = 2.12
 CATEGORIES = apps
 
-DESCRIPTION = NRPE for Nagios
+SPKG_DESC_CSWnrpe = nagios remote plugin executor (server files, client package is nrpeplugin)
+SPKG_DESC_CSWnrpeplugin = nagios remote plugin executor (client files, server package is nrpe)
+
 define BLURB
   NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well.
 endef
@@ -17,22 +19,22 @@
 REQUIRED_PKGS_CSWnrpe       = CSWosslrt CSWtcpwrap CSWcswclassutils
 REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt 
 
-SPKG_CLASSES = none cswinitsmf
+SPKG_CLASSES_CSWnrpe = none cswinitsmf
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl-lib=/opt/csw/lib
 CONFIGURE_ARGS += --with-ssl-inc=/opt/csw/include
 CONFIGURE_ARGS += --with-ssl-dir=/opt/csw/bin
 CONFIGURE_ARGS += --with-kerberos-inc=/opt/csw/include
-CONFIGURE_ARGS += --prefix=/opt/csw/nagios
-CONFIGURE_ARGS += --exec-prefix=/opt/csw/nagios
+CONFIGURE_ARGS += --prefix=/opt/csw
+CONFIGURE_ARGS += --exec-prefix=/opt/csw
 
 PATCHFILES = patch.diff	# Removal of LOG_AUTHPRIV and LOG_FTP
 			# Solaris doesn't have these log facilities
 PATCHFILES += configure.diff 
 
-sysconfdir = $(prefix)/nagios/etc
-bindir = $(prefix)/nagios/bin
+sysconfdir = $(prefix)/etc
+bindir = $(prefix)/bin
 libexecdir = $(prefix)/libexec/nagios-plugins
 datadir = $(prefix)/share
 
@@ -58,7 +60,7 @@
 	ginstall -m 644 $(WORKSRC)/README.SSL $(DESTDIR)$(DOCDIR)
 	ginstall -m 644 $(WORKSRC)/SECURITY $(DESTDIR)$(DOCDIR)
 	ginstall -m 775 -d $(DESTDIR)$(CFGDIR)
-	ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)
+	ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)/nrpe.cfg-sample
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/nrpe/trunk/checksums
===================================================================
--- csw/mgar/pkg/nrpe/trunk/checksums	2009-03-18 16:00:07 UTC (rev 3803)
+++ csw/mgar/pkg/nrpe/trunk/checksums	2009-03-18 16:22:03 UTC (rev 3804)
@@ -1,11 +1,11 @@
 b2d75e2962f1e3151ef58794d60c9e97  download/nrpe-2.12.tar.gz
-92411c5c2fd596a0e1b5fd77f97bff4b  download/CSWnrpe.gspec
-4dd4b521ecafb3742bdbbdd7d6e84403  download/CSWnrpe.prototype
+1c656040abd280f9228b42df744d93eb  download/CSWnrpe.gspec
+11953efe2c65e3efb7c39342185a96ba  download/CSWnrpe.prototype
 bda68135e2b65da40c3d2b68a3b8dc78  download/CSWnrpe.checkinstall
 53eea7ed36535bb6cbe1d6fe0aae3508  download/CSWnrpe.preinstall
 393872a95d2b9ec90363664c31074415  download/CSWnrpe.preremove
-708c90700a7e1d79fe06e94a78fc1eea  download/cswnrpe
-54aebe8f3d7bc8d2ec5ea1954d859b10  download/CSWnrpeplugin.gspec
+cbfc86ba77e78e2f860f90a303a1abe5  download/cswnrpe
+5eaf5f95a021fc9bf55ac80c87fcb243  download/CSWnrpeplugin.gspec
 e22a7817c7665e79bcbad7e091375be9  download/CSWnrpeplugin.prototype
 5b02d4385daaea2a8c13903539aa6189  download/patch.diff
 4b51476c782d2c5764d10f8ed530ada0  download/configure.diff

Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec	2009-03-18 16:00:07 UTC (rev 3803)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.gspec	2009-03-18 16:22:03 UTC (rev 3804)
@@ -1,4 +1,3 @@
 %var            bitname nrpe
 %var            pkgname CSWnrpe
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-#%copyright      url file://%{WORKSRC}/LICENSE

Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype	2009-03-18 16:00:07 UTC (rev 3803)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype	2009-03-18 16:22:03 UTC (rev 3804)
@@ -1,7 +1,7 @@
-d none /opt/csw/nagios/bin 0755 nagios nagios
-f none /opt/csw/nagios/bin/nrpe 0775 nagios nagios
-d none /opt/csw/nagios/etc 0755 nagios nagios
-f none /opt/csw/nagios/etc/nrpe.cfg 0644 nagios nagios
+d none /opt/csw/bin 0755 root bin
+f none /opt/csw/bin/nrpe 0775 root bin
+d none /opt/csw/etc 0755 root bin
+f none /opt/csw/etc/nrpe.cfg-sample 0644 root bin
 d none /opt/csw/share/doc/nrpe 0755 root bin
 f none /opt/csw/share/doc/nrpe/NRPE.pdf 0644 root bin
 f none /opt/csw/share/doc/nrpe/LEGAL 0644 root bin

Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec	2009-03-18 16:00:07 UTC (rev 3803)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpeplugin.gspec	2009-03-18 16:22:03 UTC (rev 3804)
@@ -1,4 +1,3 @@
 %var            bitname nrpeplugin
 %var            pkgname CSWnrpeplugin
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-#%copyright      url file://%{WORKSRC}/LICENSE

Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/cswnrpe	2009-03-18 16:00:07 UTC (rev 3803)
+++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe	2009-03-18 16:22:03 UTC (rev 3804)
@@ -11,10 +11,23 @@
 
 #FMRI application       # FMRI path for service
 
+SMF_EXIT_ERR_CONFIG=1
+
+if [ -f /lib/svc/share/smf_include.sh ]
+then
+	. /lib/svc/share/smf_include.sh
+fi
+
 CONFIG_FILE=/etc/opt/csw/nrpe.cfg
 if [ ! -f $CONFIG_FILE ] ; then
     CONFIG_FILE=/opt/csw/nagios/etc/nrpe.cfg
 fi
+
+if [ ! -f $CONFIG_FILE ]
+then
+	exit $SMF_EXIT_ERR_CONFIG
+fi
+
 BIN_FILE="/opt/csw/nagios/bin/nrpe"
 pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'`
 NRPE_USER=`awk -F'=' '/nrpe_user/ { print $NF }' $CONFIG_FILE`


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

