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

j_arndt at users.sourceforge.net j_arndt at users.sourceforge.net
Sun Oct 11 20:07:00 CEST 2009


Revision: 6833
          http://gar.svn.sourceforge.net/gar/?rev=6833&view=rev
Author:   j_arndt
Date:     2009-10-11 18:06:59 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
nrpe: use of cswusergroup, switched to dynamic dependencies, configuration file moved to /etc/opt/csw

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

Added Paths:
-----------
    csw/mgar/pkg/nrpe/trunk/files/cswusergroup

Removed Paths:
-------------
    csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove

Modified: csw/mgar/pkg/nrpe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nrpe/trunk/Makefile	2009-10-11 17:22:49 UTC (rev 6832)
+++ csw/mgar/pkg/nrpe/trunk/Makefile	2009-10-11 18:06:59 UTC (rev 6833)
@@ -12,20 +12,30 @@
 SF_PROJ = nagios
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWnrpe, prototype checkinstall preinstall preremove )
-DISTFILES += cswnrpe
+
+# Distfiles for CSWnrpe
+
+DISTFILES += CSWnrpe.preinstall CSWnrpe.prototype
+DISTFILES += cswnrpe cswusergroup
 DISTFILES += README_8k
-DISTFILES += $(call admfiles,CSWnrpeplugin, prototype )
 
+# Distfiles for check_nrpe
+
+DISTFILES += CSWnrpeplugin.prototype
+
 PATCHFILES = patch.diff configure.diff
 
 PATCHFILES_isa-sparcv8-size-8k = common.h.diff
 PATCHFILES_isa-i386-size-8k = common.h.diff
 
+PACKAGES = CSWnrpe CSWnrpeplugin
+CATALOGNAME_CSWmuninmaster = nrpe
+CATALOGNAME_CSWmuninnode = nrpe_plugin
+
 REQUIRED_PKGS_CSWnrpe       = CSWosslrt CSWtcpwrap CSWcswclassutils
 REQUIRED_PKGS_CSWnrpeplugin = CSWosslrt 
 
-SPKG_CLASSES_CSWnrpe = none cswpreserveconf cswinitsmf
+SPKG_CLASSES_CSWnrpe = none cswusergroup cswpreserveconf cswinitsmf
 
 EXTRA_MODULATORS = SIZE
 MODULATIONS_SIZE = 1k 8k
@@ -41,12 +51,7 @@
 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 
-#PATCHFILES += common.h.diff # Enable packet size of 8192 bytes
-
-sysconfdir = $(prefix)/etc
+sysconfdir = /etc/${prefix}
 bindir = $(prefix)/bin
 libexecdir = $(prefix)/libexec/nagios-plugins
 datadir = $(prefix)/share
@@ -71,6 +76,7 @@
 	ginstall -m 775 -d $(DESTDIR)$(DOCDIR)
 	ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR)
 	ginstall -m 755 -d $(DESTDIR)$(BINDIR)
+	ginstall -m 755 -d $(DESTDIR)/nagios
 	ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR)
 	ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k
 	ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR)
@@ -83,6 +89,8 @@
 	ginstall -m 644 $(WORKSRC)/sample-config/nrpe.cfg $(DESTDIR)$(CFGDIR)/nrpe.cfg.CSW
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -m 755 $(FILEDIR)/cswnrpe $(DESTDIR)/etc/opt/csw/init.d/cswnrpe
+	@ginstall -m 755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWnrpe
+	@ginstall -m 644 $(FILEDIR)/cswusergroup $(DESTDIR)/opt/csw/etc/pkg/CSWnrpe/cswusergroup
 	@$(MAKECOOKIE)
 
 merge-copy-nrpe-only:

Modified: csw/mgar/pkg/nrpe/trunk/checksums
===================================================================
--- csw/mgar/pkg/nrpe/trunk/checksums	2009-10-11 17:22:49 UTC (rev 6832)
+++ csw/mgar/pkg/nrpe/trunk/checksums	2009-10-11 18:06:59 UTC (rev 6833)
@@ -1,13 +1,10 @@
-bda68135e2b65da40c3d2b68a3b8dc78  download/CSWnrpe.checkinstall
-1c656040abd280f9228b42df744d93eb  download/CSWnrpe.gspec
-53eea7ed36535bb6cbe1d6fe0aae3508  download/CSWnrpe.preinstall
-393872a95d2b9ec90363664c31074415  download/CSWnrpe.preremove
-ff0be2f6b8d7fa72875d570fff53c3e6  download/CSWnrpe.prototype
-2b35d5e0d57bcb3aff096040e0d06b8b  download/CSWnrpeplugin.gspec
+afe807962bd3d189e78a92f040b10eff  download/CSWnrpe.preinstall
+67dc14268283a23ac8ee9ae29614b6dc  download/CSWnrpe.prototype
 6eafe4b86758d91ac3fc4c0e759f25a0  download/CSWnrpeplugin.prototype
 3bb2fbb228a6e2d0a99d981d82610d9a  download/README_8k
 36b85dd37d47a3813bfef5dee5804b61  download/common.h.diff
 4b51476c782d2c5764d10f8ed530ada0  download/configure.diff
-0e9afe89caf7b60817165842c6e36780  download/cswnrpe
+f7b166f02aa2cefb76fc235f6edd1745  download/cswnrpe
+0a98ba4dd462e50f23239433117bae5e  download/cswusergroup
 b2d75e2962f1e3151ef58794d60c9e97  download/nrpe-2.12.tar.gz
 5b02d4385daaea2a8c13903539aa6189  download/patch.diff

Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall	2009-10-11 17:22:49 UTC (rev 6832)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preinstall	2009-10-11 18:06:59 UTC (rev 6833)
@@ -1,23 +1,18 @@
-# This script exists to make sure the required user
-# accounts nagios and groups nagios exist.
-# 2006-02-27: group nagioscm is required.
-# 2007-09-11 Fix PKG_INSTALL_ROOT usage.  BASEDIR is not used for non
-#            relocatable packages.
+cat << EOF
 
-#If installing package on a filesystem tree not running the OS; then exit.
-if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi
+=======================================================================
 
-NAGIOSHOME=/opt/csw/nagios
+From package revision nrpe-2.12,REV=2009.10.11 on the configuration
+file for NRPE is stored in /etc/opt/csw/.
 
-if [ "$NEEDNAGGROUP" = 1 ] ; then
-        echo adding nagios group
-        /usr/sbin/groupadd nagios
-fi
+No further action is needed (to have a backup is always a good idea).
 
-if [ "$NEEDNAGUSER" = 1 ] ; then
-        echo adding nagios user
-        /usr/sbin/useradd -g nagios nagios
-        /usr/sbin/usermod -s /bin/false -d $NAGIOSHOME nagios
-fi
+            Installation will proceed in 10 seconds.
+             Press CTRL+C if you want to stop now.
 
+=======================================================================
+EOF
+
+sleep 10
+
 exit 0

Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove	2009-10-11 17:22:49 UTC (rev 6832)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.preremove	2009-10-11 18:06:59 UTC (rev 6833)
@@ -1,27 +0,0 @@
-# nrpe - preremove script
-# 2007-09-11 Fix PKG_INSTALL_ROOT usage.  BASEDIR is not used for non
-#            relocatable packages.
-#
-# Stop nagios if it is running.
-
-#If removing package from a filesystem tree not running the OS; then exit.
-if [ ! x"$PKG_INSTALL_ROOT" = x"" ] ; then exit 0 ; fi
-
-smf=no
-if [ -f /usr/sbin/svccfg -a -f /usr/sbin/svcadm ] ; then smf=yes ; fi
-
-  echo "## Stopping nrpe"
-  if [ $smf = yes ]
-  then
-    # Disable service
-    /usr/sbin/svcadm disable -s svc:application/cswnrpe:default >/dev/null 2>&1
-  else
-    /etc/init.d/cswnrpe stop >/dev/null 2>&1
-  fi
-
-if [ $smf = yes ] ; then
-    # Unregister with SMF
-    /usr/sbin/svccfg delete svc:application/cswnrpe:default >/dev/null 2>&1
-fi
-
-exit 0

Modified: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype	2009-10-11 17:22:49 UTC (rev 6832)
+++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.prototype	2009-10-11 18:06:59 UTC (rev 6833)
@@ -3,7 +3,7 @@
 f none /opt/csw/bin/nrpe_8k 0775 root bin
 s none /opt/csw/bin/nrpe=/opt/csw/bin/nrpe_1k
 d none /opt/csw/etc 0755 root bin
-f cswpreserveconf /opt/csw/etc/nrpe.cfg.CSW 0644 root bin
+f cswpreserveconf /etc/opt/csw/nrpe.cfg.CSW 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
@@ -11,6 +11,9 @@
 f none /opt/csw/share/doc/nrpe/README_8k 0644 root bin
 f none /opt/csw/share/doc/nrpe/README.SSL 0644 root bin
 f none /opt/csw/share/doc/nrpe/SECURITY 0644 root bin
+d none /opt/csw/nagios 755 root bin
 f cswinitsmf /etc/opt/csw/init.d/cswnrpe 0755 root bin
+d none /opt/csw/etc/pkg/CSWnrpe 0755 root bin
+f cswusergroup /opt/csw/etc/pkg/CSWnrpe/cswusergroup 0644 root bin
 i depend=CSWnrpe.depend
 i pkginfo=CSWnrpe.pkginfo

Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/cswnrpe	2009-10-11 17:22:49 UTC (rev 6832)
+++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe	2009-10-11 18:06:59 UTC (rev 6833)
@@ -9,7 +9,12 @@
 # 2007-08-19 Fix nagios uid used for pgrep.  Thanks to Will McDonald for this.
 # Modified for OpenCSW by Juergen Arndt 2009-03-14 
 
+#RC_KNUM 20         # Number used for kill script symlink, e.g. K20cswfoo
+#RC_SNUM 80         # Number used for start script symlink, e.g. S80cswfoo
+#RC_KLEV 0,1,2,S    # Run levels that should have a kill script symlink
+#RC_SLEV 3          # Run levels that should have a start script symlink
 #FMRI application       # FMRI path for service
+#AUTOENABLE yes
 
 SMF_EXIT_ERR_CONFIG=1
 

Added: csw/mgar/pkg/nrpe/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/nrpe/trunk/files/cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/nrpe/trunk/files/cswusergroup	2009-10-11 18:06:59 UTC (rev 6833)
@@ -0,0 +1 @@
+nagios:nagios:Nagios user:/opt/csw/nagios:/bin/false:m:r


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



More information about the devel mailing list