Revision: 3831
http://gar.svn.sourceforge.net/gar/?rev=3831&view=rev
Author: j_arndt
Date: 2009-03-19 21:30:39 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
nagios: included cswpreserveconf
Modified Paths:
--------------
csw/mgar/pkg/nagios/trunk/Makefile
csw/mgar/pkg/nagios/trunk/checksums
csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype
Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile 2009-03-19 20:39:06 UTC (rev 3830)
+++ csw/mgar/pkg/nagios/trunk/Makefile 2009-03-19 21:30:39 UTC (rev 3831)
@@ -22,9 +22,9 @@
# necessary, so ginstall doesn't get -o and -g
options
REQUIRED_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg
CSWlibtoolrt CSWggettextrt
-REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp
CSWnrpeplugin CSWcswclassutils
+REQUIRED_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp
CSWcswclassutils
-SPKG_CLASSES = none cswinitsmf
+SPKG_CLASSES = none cswpreserveconf cswinitsmf
prefix = $(BUILD_PREFIX)/nagios
libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins
@@ -41,24 +41,40 @@
BUILD_ARGS = all
+ENABLE_CHECK = 0
+
TEST_TARGET = none
INSTALL_ARGS += install-init
-INSTALL_ARGS += install-config
+#INSTALL_ARGS += install-config
INSTALL_ARGS += install-commandmode
-
include gar/category.mk
DOCS = Changelog INSTALLING README UPGRADING
DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios
HTTPD_CONF = $(DESTDIR)$(sysconfdir)
+CFGDIR = $(prefix)/etc
post-install-modulated:
- @ginstall -m 755 -d $(DOCDEST)
+ @ginstall -m 755 -d $(DOCDEST)
+ @ginstall -m 755 -d $(HTTPD_CONF)
@$(foreach DOC,$(DOCS),ginstall -m 644 $(WORKSRC)/$(DOC) $(DOCDEST);)
@ginstall -m 644 $(WORKSRC)/LICENSE $(DOCDEST)
@ginstall -m 644 $(WORKSRC)/sample-config/httpd.conf
$(HTTPD_CONF)/httpd-nagios.conf
@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
@ginstall -m 755 $(FILEDIR)/cswnagios
$(DESTDIR)/etc/opt/csw/init.d/cswnagios
+ @ginstall -m 775 -d $(DESTDIR)$(CFGDIR)
+ @ginstall -m 775 -d $(DESTDIR)$(CFGDIR)/objects
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg
$(DESTDIR)$(CFGDIR)/nagios.cfg.CSW
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg
$(DESTDIR)$(CFGDIR)/cgi.cfg.CSW
+ @ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg
$(DESTDIR)$(CFGDIR)/resource.cfg.CSW
+ @ginstall -b -m 664
$(WORKSRC)/sample-config/template-object/templates.cfg
$(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW
+ @ginstall -b -m 664
$(WORKSRC)/sample-config/template-object/commands.cfg
$(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW
+ @ginstall -b -m 664
$(WORKSRC)/sample-config/template-object/contacts.cfg
$(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW
+ @ginstall -b -m 664
$(WORKSRC)/sample-config/template-object/timeperiods.cfg
$(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg.CSW
+ @ginstall -b -m 664
$(WORKSRC)/sample-config/template-object/localhost.cfg
$(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW
+ @ginstall -b -m 664
$(WORKSRC)/sample-config/template-object/windows.cfg
$(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW
+ @ginstall -b -m 664
$(WORKSRC)/sample-config/template-object/printer.cfg
$(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW
+ @ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg
$(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/nagios/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagios/trunk/checksums 2009-03-19 20:39:06 UTC (rev 3830)
+++ csw/mgar/pkg/nagios/trunk/checksums 2009-03-19 21:30:39 UTC (rev 3831)
@@ -3,7 +3,7 @@
e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall
47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall
92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove
-b3edb7772696d23bfc3973e04b7d8d5d download/CSWnagios.prototype
+a238294a9fc50821dd134b2a50fff545 download/CSWnagios.prototype
d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios
0ef601e30d01a511822dd27df6b0e531 download/patch.diff
4faa5ec86586be23dfbbd9165f50046d download/configure.diff
Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-19 20:39:06 UTC
(rev 3830)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-03-19 21:30:39 UTC
(rev 3831)
@@ -4,19 +4,19 @@
f none /opt/csw/nagios/bin/nagiostats 0774 nagios nagios
f none /opt/csw/nagios/bin/p1.pl 0664 nagios nagios
d none /opt/csw/nagios/etc 0755 nagios nagios
-f none /opt/csw/nagios/etc/cgi.cfg 0664 nagios nagios
+f cswpreserveconf /opt/csw/nagios/etc/cgi.cfg.CSW 0664 nagios nagios
f none /opt/csw/nagios/etc/httpd-nagios.conf 0644 nagios nagios
-f none /opt/csw/nagios/etc/nagios.cfg 0664 nagios nagios
+f cswpreserveconf /opt/csw/nagios/etc/nagios.cfg.CSW 0664 nagios nagios
d none /opt/csw/nagios/etc/objects 0755 nagios nagios
-f none /opt/csw/nagios/etc/objects/commands.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/objects/contacts.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/objects/localhost.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/objects/printer.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/objects/switch.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/objects/templates.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/objects/timeperiods.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/objects/windows.cfg 0664 nagios nagios
-f none /opt/csw/nagios/etc/resource.cfg 0660 nagios nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/commands.cfg.CSW 0664 nagios
nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/contacts.cfg.CSW 0664 nagios
nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/localhost.cfg.CSW 0664 nagios
nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/printer.cfg.CSW 0664 nagios
nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/switch.cfg.CSW 0664 nagios nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/templates.cfg.CSW 0664 nagios
nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/timeperiods.cfg.CSW 0664 nagios
nagios
+f cswpreserveconf /opt/csw/nagios/etc/objects/windows.cfg.CSW 0664 nagios
nagios
+f cswpreserveconf /opt/csw/nagios/etc/resource.cfg.CSW 0660 nagios nagios
d none /opt/csw/nagios/libexec 0755 nagios nagios
d none /opt/csw/nagios/sbin 0755 nagios nagios
f none /opt/csw/nagios/sbin/avail.cgi 0775 nagios nagios
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
