Revision: 16303
http://gar.svn.sourceforge.net/gar/?rev=16303&view=rev
Author: d_pocock
Date: 2011-11-27 04:40:34 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
ganglia: more config file fixes
Modified Paths:
--------------
csw/mgar/pkg/ganglia/trunk/Makefile
csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall
Added Paths:
-----------
csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf
Removed Paths:
-------------
csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW
Modified: csw/mgar/pkg/ganglia/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ganglia/trunk/Makefile 2011-11-27 03:41:10 UTC (rev 16302)
+++ csw/mgar/pkg/ganglia/trunk/Makefile 2011-11-27 04:40:34 UTC (rev 16303)
@@ -138,7 +138,8 @@
ETCGANGLIA = $(sysconfdir)
PKGFILES_CSWganglia =
-PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW
etc/opt/csw/ganglia/conf.d/modgstatus.conf.CSW .*/sbin/gmond .*/bin/gmetric
$(call baseisadirs,$(libdir),ganglia/mod*\.so) /etc/opt/csw/init.d/cswgmond
+PKGFILES_CSWgangliaagent = .*/gmond.conf.CSW .*/modgstatus.conf.CSW
.*/sbin/gmond .*/bin/gmetric /etc/opt/csw/init.d/cswgmond
+PKGFILES_CSWgangliaagent += .*/modsys.so .*/modcpu.so .*/modnet.so
.*/modmulticpu.so .*/modmem.so .*/modload.so .*/moddisk.so .*/modproc.so
PKGFILES_CSWlibganglia0 += $(call
baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0\.0\.0)
PKGFILES_CSWlibganglia0 += $(call
baseisadirs,$(libdir),libganglia-3\.1\.7\.so\.0(\.\d+)*)
CHECKPKG_OVERRIDES_CSWlibganglia0 +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libganglia-3.1.7.so.0.0.0|soname=libganglia-3.1.7.so.0|pkgname=CSWlibganglia0|expected=CSWlibganglia3-1-7-0
@@ -177,15 +178,13 @@
@ginstall -D $(DOWNLOADDIR)/cswgmetad \
$(PKGROOT)/etc/opt/csw/init.d/cswgmetad
@ginstall -d $(DESTDIR)$(WWWGANGLIA)
- @ginstall -d $(DESTDIR)$(sysconfdir)/ganglia
- @ginstall -d $(DESTDIR)$(sysconfdir)/ganglia/conf.d
@cd $(WORKSRC)/web; \
cp -R * $(DESTDIR)$(WWWGANGLIA)
@rm -rf $(DESTDIR)$(WWWGANGLIA)/conf.php
@ginstall -D $(FILEDIR)/conf.php \
$(DESTDIR)$(WWWGANGLIA)/conf.php.CSW
@rm -rf $(DESTDIR)$(WWWGANGLIA)/*.in
- @ginstall -D $(FILEDIR)/httpd-ganglia.conf.CSW \
+ @ginstall -D $(FILEDIR)/httpd-ganglia.conf \
$(DESTDIR)/opt/csw/apache2/etc/extra/httpd-ganglia.conf.CSW
@ginstall -d $(DESTDIR)$(ETCGANGLIA)/conf.d
@$(WORKSRC)/gmond/gmond -t | grep -v "^include" \
@@ -196,7 +195,7 @@
$(DESTDIR)$(ETCGANGLIA)/gmetad.conf
@cd $(WORKSRC)/gmond/modules/conf.d; \
for CONF_FILE in *.conf ; \
- do cp -R "$${CONF_FILE}"
$(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}" ; done
+ do cp -R "$${CONF_FILE}"
$(DESTDIR)$(ETCGANGLIA)/conf.d/"$${CONF_FILE}.CSW" ; done
@rm -rf $(DESTDIR)$(ETCGANGLIA)/conf.d/example.conf.CSW \
$(DESTDIR)$(ETCGANGLIA)/conf.d/multicpu.conf.CSW
ifeq ($(VERSION),3.1.2)
Modified: csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall
===================================================================
--- csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2011-11-27
03:41:10 UTC (rev 16302)
+++ csw/mgar/pkg/ganglia/trunk/files/CSWgangliaweb.postinstall 2011-11-27
04:40:34 UTC (rev 16303)
@@ -4,12 +4,12 @@
AP2CONF=/opt/csw/apache2/etc/httpd.conf
# 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 [ -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}
Copied: csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf (from rev 16274,
csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW)
===================================================================
--- csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf
(rev 0)
+++ csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf 2011-11-27 04:40:34 UTC
(rev 16303)
@@ -0,0 +1,13 @@
+
+Alias /ganglia "/opt/csw/share/www/ganglia"
+
+<Directory "/opt/csw/share/www/ganglia">
+ AllowOverride None
+ DirectoryIndex index.html index.php
+ <Limit GET OPTIONS>
+ Order allow,deny
+ Allow from all
+ </Limit>
+</Directory>
+
+
Deleted: csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW
===================================================================
--- csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW 2011-11-27
03:41:10 UTC (rev 16302)
+++ csw/mgar/pkg/ganglia/trunk/files/httpd-ganglia.conf.CSW 2011-11-27
04:40:34 UTC (rev 16303)
@@ -1,13 +0,0 @@
-
-Alias /ganglia "/opt/csw/share/www/ganglia"
-
-<Directory "/opt/csw/share/www/ganglia">
- AllowOverride None
- DirectoryIndex index.html index.php
- <Limit GET OPTIONS>
- Order allow,deny
- Allow from all
- </Limit>
-</Directory>
-
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
