Revision: 4000
http://gar.svn.sourceforge.net/gar/?rev=4000&view=rev
Author: j_arndt
Date: 2009-03-27 20:00:09 +0000 (Fri, 27 Mar 2009)
Log Message:
-----------
nsca: fixes for #3493 and #3495
Modified Paths:
--------------
csw/mgar/pkg/nsca/trunk/Makefile
csw/mgar/pkg/nsca/trunk/checksums
csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype
csw/mgar/pkg/nsca/trunk/files/cswnsca
csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff
Modified: csw/mgar/pkg/nsca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nsca/trunk/Makefile 2009-03-27 16:57:36 UTC (rev 3999)
+++ csw/mgar/pkg/nsca/trunk/Makefile 2009-03-27 20:00:09 UTC (rev 4000)
@@ -25,7 +25,7 @@
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-nsca-port=5667
-CONFIGURE_ARGS += --localstatedir=/opt/csw/var
+CONFIGURE_ARGS += --localstatedir=/opt/csw/nagios/var
BUILD_TARGETS = nsca
@@ -46,8 +46,8 @@
ginstall -d $(DESTDIR)$(NAGIOSBINDIR)
ginstall -d $(DESTDIR)$(NAGIOSCFGDIR)
ginstall -m 755 -d $(DESTDIR)$(NSCADOCDIR)
- ginstall -m 755 $(WORKSRC)/src/nsca $(DESTDIR)$(NAGIOSBINDIR)
- ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg
$(DESTDIR)$(NAGIOSCFGDIR)/nsca.cfg.CSW
+ ginstall -m 755 $(WORKSRC)/src/nsca $(DESTDIR)$(BINDIR)
+ ginstall -m 600 $(WORKSRC)/sample-config/nsca.cfg
$(DESTDIR)$(CFGDIR)/nsca.cfg.CSW
ginstall -m 644 $(WORKSRC)/Changelog $(DESTDIR)$(NSCADOCDIR)
ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(NSCADOCDIR)
ginstall -m 644 $(WORKSRC)/README $(DESTDIR)$(NSCADOCDIR)
Modified: csw/mgar/pkg/nsca/trunk/checksums
===================================================================
--- csw/mgar/pkg/nsca/trunk/checksums 2009-03-27 16:57:36 UTC (rev 3999)
+++ csw/mgar/pkg/nsca/trunk/checksums 2009-03-27 20:00:09 UTC (rev 4000)
@@ -1,10 +1,10 @@
33a98e7975f633a9489d7a8938ed6131 download/nsca-2.7.2.tar.gz
82f1144c12dc6247524609dbeefc3023 download/CSWnsca.gspec
-fee61a84d3032fff1c44ccabbdde7937 download/CSWnsca.prototype
+8c361f9d906717cce8549223ce1880e2 download/CSWnsca.prototype
1886b15eafd2e2a5a4b230918960ea9a download/CSWnsca.checkinstall
7fef893e65bb68bc0762434dbeace713 download/CSWnsca.preinstall
0f458cf358b1aab192c02fd0d37b1220 download/CSWsendnsca.gspec
664e84201491b489ae20b983a150d72a download/CSWsendnsca.prototype
8bf9882f3115e8514ae6d9a866397c71 download/CSWsendnsca.preinstall
-55a1c5523b2fe1ee66b45a2807e80bd6 download/cswnsca
-08b769c5511342dd03fa01fea44cb260 download/submit_check_results.diff
+a91191171ffecb4d7261cc4adfb1a427 download/cswnsca
+cbb38cacd3ca318f00dfa0877b6017df download/submit_check_results.diff
Modified: csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype
===================================================================
--- csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-27 16:57:36 UTC
(rev 3999)
+++ csw/mgar/pkg/nsca/trunk/files/CSWnsca.prototype 2009-03-27 20:00:09 UTC
(rev 4000)
@@ -1,7 +1,5 @@
-1 d none /opt/csw/nagios/bin 0755 nagios nagios
-1 f none /opt/csw/nagios/bin/nsca 0755 nagios nagios
-1 d none /opt/csw/nagios/etc 0755 nagios nagios
-1 f cswpreserveconf /opt/csw/nagios/etc/nsca.cfg.CSW 0600 nagios nagios
+1 f none /opt/csw/bin/nsca 0755 root bin
+1 f cswpreserveconf /opt/csw/etc/nsca.cfg.CSW 0644 root bin
1 d none /opt/csw/share/doc/nsca 0755 root bin
1 f none /opt/csw/share/doc/nsca/Changelog 0644 root bin
1 f none /opt/csw/share/doc/nsca/LEGAL 0644 root bin
Modified: csw/mgar/pkg/nsca/trunk/files/cswnsca
===================================================================
--- csw/mgar/pkg/nsca/trunk/files/cswnsca 2009-03-27 16:57:36 UTC (rev
3999)
+++ csw/mgar/pkg/nsca/trunk/files/cswnsca 2009-03-27 20:00:09 UTC (rev
4000)
@@ -9,7 +9,7 @@
#FMRI application # FMRI path for service
-CONFIG_FILE=/opt/csw/nagios/etc/nsca.cfg
+CONFIG_FILE=/opt/csw/etc/nsca.cfg
SMF_EXIT_ERR_CONFIG=1
@@ -23,7 +23,7 @@
exit $SMF_EXIT_ERR_CONFIG
fi
-BIN_FILE="/opt/csw/nagios/bin/nsca"
+BIN_FILE="/opt/csw/bin/nsca"
pidfile=`grep '^pid_file' $CONFIG_FILE |awk '{ FS = "=" } {print $2;}'`
nsca_USER=`awk -F'=' '/nsca_user/ { print $NF }' $CONFIG_FILE`
Modified: csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff
===================================================================
--- csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff 2009-03-27
16:57:36 UTC (rev 3999)
+++ csw/mgar/pkg/nsca/trunk/files/submit_check_results.diff 2009-03-27
20:00:09 UTC (rev 4000)
@@ -37,4 +37,4 @@
+# in turn transmits the data to the nsca daemon on the central
+# monitoring server
+
-+/usr/bin/echo "$1\t$2\t$return_code\t$4" | /opt/csw/nagios/bin/send_nsca
my.central.server -c /opt/csw/nagios/etc/send_nsca.cfg
++/usr/bin/echo "$1\t$2\t$return_code\t$4" | /opt/csw/bin/send_nsca
my.central.server -c /opt/csw/etc/send_nsca.cfg
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
