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

[d_pocock at users.sourceforge.net]

Revision: 17524
          http://gar.svn.sourceforge.net/gar/?rev=17524&view=rev
Author:   d_pocock
Date:     2012-03-22 17:09:02 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
ganglia: create extra directories/perms required for new web UI

Modified Paths:
--------------
    csw/mgar/pkg/ganglia/trunk/Makefile

Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile	2012-03-22 16:55:20 UTC (rev 17523)
+++ csw/mgar/pkg/ganglia/trunk/Makefile	2012-03-22 17:09:02 UTC (rev 17524)
@@ -132,6 +132,7 @@
 WWWGANGLIA = $(WWWROOT)/ganglia
 sysconfdir = /etc/opt/csw/ganglia
 ETCGANGLIA = $(sysconfdir)
+VARGANGLIA = /var/opt/csw/ganglia
 
 PKGFILES_CSWganglia = 
 PKGFILES_CSWgangliaagent  = /etc/opt/csw/ganglia/gmond.conf.CSW
@@ -173,12 +174,13 @@
 PKGFILES_CSWgangliagmetad = /opt/csw/sbin/gmetad
 PKGFILES_CSWgangliagmetad += /etc/opt/csw/ganglia/gmetad.conf.CSW
 PKGFILES_CSWgangliagmetad += /etc/opt/csw/init.d/cswgmetad
-PKGFILES_CSWgangliagmetad += /var/opt/csw/ganglia/rrds
+PKGFILES_CSWgangliagmetad += $(VARGANGLIA)/rrds
 PKGFILES_CSWgangliagmetad += /opt/csw/share/man/man1/gmetad.1
 
 PKGFILES_CSWgangliaweb = $(WWWGANGLIA)/.*
 PKGFILES_CSWgangliaweb += /opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
-PKGFILES_CSWgangliaweb += /var/opt/csw/ganglia/dwoo
+PKGFILES_CSWgangliaweb += $(VARGANGLIA)/dwoo
+PKGFILES_CSWgangliaweb += $(VARGANGLIA)/conf
 
 PRESERVECONF = /opt/csw/apache2/etc/extra/httpd-ganglia.conf
 PRESERVECONF += /etc/opt/csw/ganglia/gmond.conf
@@ -198,6 +200,7 @@
 
 PROTOTYPE_FILTER_CSWgangliaweb = awk '\
 $$$$3 ~ /\/var\/opt\/csw\/ganglia\/dwoo/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
+$$$$3 ~ /\/var\/opt\/csw\/ganglia\/conf/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
 { print }'
 
 #ARCHALL_CSWganglia-dev = 1
@@ -242,8 +245,9 @@
 ifeq ($(VERSION),3.1.2)
 	@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/modgstatus.conf.CSW
 endif
-	@ginstall -d $(DESTDIR)/var/opt/csw/ganglia/rrds
-	@ginstall -d $(DESTDIR)/var/opt/csw/ganglia/dwoo
+	@ginstall -d $(DESTDIR)$(VARGANGLIA)/rrds
+	@ginstall -d $(DESTDIR)$(VARGANGLIA)/dwoo
+	@ginstall -d $(DESTDIR)$(VARGANGLIA)/conf
 	@ginstall -D $(WORKSRC)/gmond/gmond.conf.5 $(DESTDIR)$(mandir)/man5/gmond.conf.5
 	@ginstall -D $(WORKSRC)/mans/gmetad.1 $(DESTDIR)$(mandir)/man1/gmetad.1
 	@ginstall -D $(WORKSRC)/mans/gmond.1 $(DESTDIR)$(mandir)/man1/gmond.1

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