Revision: 6604
http://gar.svn.sourceforge.net/gar/?rev=6604&view=rev
Author: j_arndt
Date: 2009-09-29 10:34:54 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
nagios: moved config / log files to /etc/opt/csw/nagios / /var/opt/csw/nagios
Modified Paths:
--------------
csw/mgar/pkg/nagios/trunk/Makefile
csw/mgar/pkg/nagios/trunk/checksums
csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall
csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype
Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile 2009-09-29 09:45:05 UTC (rev 6603)
+++ csw/mgar/pkg/nagios/trunk/Makefile 2009-09-29 10:34:54 UTC (rev 6604)
@@ -32,6 +32,7 @@
prefix = $(BUILD_PREFIX)/nagios
libexecdir = $(BUILD_PREFIX)/libexec/nagios-plugins
+sysconfdir = /etc$(prefix)
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --prefix=$(prefix)
@@ -42,6 +43,9 @@
CONFIGURE_ARGS += --with-gd-lib-dir=$(BUILD_PREFIX)/lib
CONFIGURE_ARGS += --with-gd-lib-inc=$(BUILD_PREFIX)/inc
CONFIGURE_ARGS += --enable-embedded-perl
+CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/nagios/spool/checkresults
+CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/nagios/nagios.lock
+CONFIGURE_ARGS += --localstatedir=/var$(prefix)
EXTRA_LIB = $(BUILD_PREFIX)/lib
EXTRA_INC = $(BUILD_PREFIX)/include
@@ -64,14 +68,13 @@
DOCS = Changelog INSTALLING README UPGRADING
DOCDEST = $(DESTDIR)$(BUILD_PREFIX)/share/doc/nagios
HTTPD_CONF = $(DESTDIR)$(sysconfdir)
-CFGDIR = $(prefix)/etc
+CFGDIR = /etc/$(prefix)
post-install-modulated:
@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)
@@ -79,6 +82,7 @@
@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 644 $(WORKSRC)/sample-config/httpd.conf
$(DESTDIR)$(CFGDIR)/httpd-nagios.conf
@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
Modified: csw/mgar/pkg/nagios/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 09:45:05 UTC (rev 6603)
+++ csw/mgar/pkg/nagios/trunk/checksums 2009-09-29 10:34:54 UTC (rev 6604)
@@ -1,7 +1,7 @@
e407a4b179bd7de72b3e8c21f309f9b7 download/CSWnagios.checkinstall
-47cc36016f5518dfd5614b870f56e944 download/CSWnagios.preinstall
+db3f392c725ae6e9a3f5a969d2527b41 download/CSWnagios.preinstall
92437323de0cceaa58c6238ec9e6c954 download/CSWnagios.preremove
-42672e3ae1e539bf9747f369cb4db7f1 download/CSWnagios.prototype
+8d38acdcd6d31711af14ad09e537ea20 download/CSWnagios.prototype
e493345589ac2c592c2b958499bc8c20 download/configure.diff
d3b39178a60cf866a243d4d8f8eabb9b download/cswnagios
f3161bcb7c65f89707ee37b0a8d861d5 download/install-opts.diff
Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29
09:45:05 UTC (rev 6603)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2009-09-29
10:34:54 UTC (rev 6604)
@@ -31,4 +31,17 @@
/usr/sbin/usermod -G nagioscm nagios
fi
+cat << EOF
+
+=======================================================================
+
+Configuration files were moved from /opt/csw/nagios/etc/ to
+/etc/opt/csw/nagios/.
+
+Changes which were made to the existing config will automatically
+moved to the new location.
+
+=======================================================================
+EOF
+
exit 0
Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 09:45:05 UTC
(rev 6603)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2009-09-29 10:34:54 UTC
(rev 6604)
@@ -4,20 +4,21 @@
d none /opt/csw/nagios/bin 0755 nagios nagios
f none /opt/csw/nagios/bin/nagios 0754 nagios nagios
f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios
-d none /opt/csw/nagios/etc 0755 nagios nagios
-f cswpreserveconf /opt/csw/nagios/etc/cgi.cfg.CSW 0644 nagios nagios
-f none /opt/csw/nagios/etc/httpd-nagios.conf 0644 nagios nagios
-f cswpreserveconf /opt/csw/nagios/etc/nagios.cfg.CSW 0644 nagios nagios
-d none /opt/csw/nagios/etc/objects 0755 nagios nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/commands.cfg.CSW 0644 nagios
nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/contacts.cfg.CSW 0644 nagios
nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/localhost.cfg.CSW 0644 nagios
nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/printer.cfg.CSW 0644 nagios
nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/switch.cfg.CSW 0644 nagios nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/templates.cfg.CSW 0644 nagios
nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/timeperiods.cfg.CSW 0644 nagios
nagios
-f cswpreserveconf /opt/csw/nagios/etc/objects/windows.cfg.CSW 0644 nagios
nagios
-f cswpreserveconf /opt/csw/nagios/etc/resource.cfg.CSW 0640 nagios nagios
+f none /opt/csw/nagios/bin/p1.pl 075 nagios nagios
+d none /etc/opt/csw/nagios 0755 nagios nagios
+f cswpreserveconf /etc/opt/csw/nagios/cgi.cfg.CSW 0644 nagios nagios
+f none /etc/opt/csw/nagios/httpd-nagios.conf 0644 nagios nagios
+f cswpreserveconf /etc/opt/csw/nagios/nagios.cfg.CSW 0644 nagios nagios
+d none /etc/opt/csw/nagios/objects 0755 nagios nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/commands.cfg.CSW 0644 nagios
nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/contacts.cfg.CSW 0644 nagios
nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/localhost.cfg.CSW 0644 nagios
nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/printer.cfg.CSW 0644 nagios
nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/switch.cfg.CSW 0644 nagios nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/templates.cfg.CSW 0644 nagios
nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/timeperiods.cfg.CSW 0644 nagios
nagios
+f cswpreserveconf /etc/opt/csw/nagios/objects/windows.cfg.CSW 0644 nagios
nagios
+f cswpreserveconf /etc/opt/csw/nagios/resource.cfg.CSW 0640 nagios nagios
d none /opt/csw/nagios/sbin 0755 nagios nagios
f none /opt/csw/nagios/sbin/avail.cgi 0755 nagios nagios
f none /opt/csw/nagios/sbin/cmd.cgi 0755 nagios nagios
@@ -383,11 +384,11 @@
f none /opt/csw/nagios/share/stylesheets/summary.css 0644 nagios nagios
f none /opt/csw/nagios/share/stylesheets/tac.css 0644 nagios nagios
f none /opt/csw/nagios/share/stylesheets/trends.css 0644 nagios nagios
-d none /opt/csw/nagios/var 0755 nagios nagios
-d none /opt/csw/nagios/var/archives 0755 nagios nagios
-d none /opt/csw/nagios/var/rw 0755 nagios nagios
-d none /opt/csw/nagios/var/spool 0755 nagios nagios
-d none /opt/csw/nagios/var/spool/checkresults 0755 nagios nagios
+d none /var/opt/csw/nagios 0755 nagios nagios
+d none /var/opt/csw/nagios/archives 0755 nagios nagios
+d none /var/opt/csw/nagios/rw 0755 nagios nagios
+d none /var/opt/csw/nagios/spool 0755 nagios nagios
+d none /var/opt/csw/nagios/spool/checkresults 0755 nagios nagios
d none /opt/csw/share/doc/nagios 0755 root bin
f none /opt/csw/share/doc/nagios/Changelog 0644 root bin
f none /opt/csw/share/doc/nagios/INSTALLING 0644 root bin
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
