[csw-devel] SF.net SVN: gar:[6186] csw/mgar/pkg/ganglia/trunk

[d_pocock at users.sourceforge.net]

Revision: 6186
          http://gar.svn.sourceforge.net/gar/?rev=6186&view=rev
Author:   d_pocock
Date:     2009-09-04 21:08:11 +0000 (Fri, 04 Sep 2009)

Log Message:
-----------
ganglia: Move to /etc/opt/csw/ganglia.  Use PRESERVECONF.

Modified Paths:
--------------
    csw/mgar/pkg/ganglia/trunk/Makefile
    csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2009-09-04 20:55:55 UTC (rev 6185)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2009-09-04 21:08:11 UTC (rev 6186)
@@ -99,7 +99,7 @@
 
 WWWROOT = /opt/csw/share/www
 WWWGANGLIA = $(WWWROOT)/ganglia
-ETCGANGLIA = /opt/csw/etc/ganglia
+ETCGANGLIA = /etc/opt/csw/ganglia
 
 PKGFILES_CSWganglia = 
 PKGFILES_CSWgangliart = $(libdir)/libganglia.*
@@ -108,6 +108,8 @@
 PKGFILES_CSWgangliagmetad = .*/gmetad.* /opt/csw/var/ganglia/rrds
 PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.* /opt/csw/apache2/etc/extra/.*
 
+PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
+
 PROTOTYPE_FILTER_CSWgangliagmetad = awk '\
 $$$$3 ~ /\/opt\/csw\/var\/ganglia\/rrds/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
 { print }'
@@ -130,7 +132,7 @@
 	@ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d
 	@$(WORKSRC)/gmond/gmond -t | grep -v "^include" \
 		> $(DESTDIR)$(ETCGANGLIA)/gmond.conf
-	@echo "include ('/opt/csw/etc/ganglia/conf.d/*.conf')" \
+	@echo "include ('/etc/opt/csw/ganglia/conf.d/*.conf')" \
 		>> $(DESTDIR)$(ETCGANGLIA)/gmond.conf
 #	@ginstall -D $(FILEDIR)/gmond.conf \
 #		$(DESTDIR)$(ETCGANGLIA)/gmond.conf

Modified: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall
===================================================================
--- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall	2009-09-04 20:55:55 UTC (rev 6185)
+++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall	2009-09-04 21:08:11 UTC (rev 6186)
@@ -3,12 +3,13 @@
 AP2EXTRADIR=/opt/csw/apache2/etc/extra
 AP2CONF=/opt/csw/apache2/etc/httpd.conf
 
-if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ];
-then
-  echo "Existing config found"
-else
-  cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf"
-fi
+# no longer needed thanks to cswpreserveconf
+#if [ -f "${AP2EXTRADIR}/httpd-ganglia.conf" ];
+#then
+#  echo "Existing config found"
+#else
+#  cp "${AP2EXTRADIR}/httpd-ganglia.conf.CSW" "${AP2EXTRADIR}/httpd-ganglia.conf"
+#fi
 
 if [ -n "`grep 'Include etc/extra/httpd-ganglia.conf' ${AP2CONF}`" ]; then
       perl -i -pne 's|#(Include etc/extra/httpd-ganglia.conf)|$1|' ${AP2CONF}


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