From: <vv...@us...> - 2011-04-25 16:01:00
|
Revision: 2580 http://ganglia.svn.sourceforge.net/ganglia/?rev=2580&view=rev Author: vvuksan Date: 2011-04-25 16:00:53 +0000 (Mon, 25 Apr 2011) Log Message: ----------- Add htaccess generation to Makefile Modified Paths: -------------- branches/monitor-web-2.0/Makefile branches/monitor-web-2.0/TODO Modified: branches/monitor-web-2.0/Makefile =================================================================== --- branches/monitor-web-2.0/Makefile 2011-04-25 15:58:48 UTC (rev 2579) +++ branches/monitor-web-2.0/Makefile 2011-04-25 16:00:53 UTC (rev 2580) @@ -1,7 +1,7 @@ # Location where gweb should be installed to DESTDIR = /var/www/html/gweb -APACHE_USER = apache +APACHE_USER = apache # Gweb version GWEB_MAJOR_VERSION = 2 @@ -27,7 +27,7 @@ DIST_DIR = gweb-$(GWEB_VERSION) DIST_TARBALL = $(DIST_DIR).tar.gz -TARGETS = conf_default.php gweb.spec version.php +TARGETS = conf_default.php gweb.spec version.php .htaccess default: $(TARGETS) @@ -47,10 +47,15 @@ svn --force export . $(DIST_DIR) > /dev/null 2>&1 && \ cp -a $(TARGETS) $(DIST_DIR) +.htaccess: .htaccess.in + secret=`php -r 'echo sha1(rand().microtime());'` && \ + sed -e "s/@ganglia_secret@/$$secret/" .htaccess.in > .htaccess + install: dist-dir mkdir -p $(DESTDIR) $(GWEB_DWOO) && \ + mv $(DIST_DIR)/conf $(GWEB_STATEDIR)/ganglia && \ cp -a $(DIST_DIR)/* $(DESTDIR) && \ - chown -R $(APACHE_USER):$(APACHE_USER) $(GWEB_DWOO) $(DESTDIR)/conf + chown -R $(APACHE_USER):$(APACHE_USER) $(GWEB_DWOO) $(GWEB_STATEDIR)/ganglia/conf dist-gzip: dist-dir if [ -f $(DIST_TARBALL) ]; then \ Modified: branches/monitor-web-2.0/TODO =================================================================== --- branches/monitor-web-2.0/TODO 2011-04-25 15:58:48 UTC (rev 2579) +++ branches/monitor-web-2.0/TODO 2011-04-25 16:00:53 UTC (rev 2580) @@ -10,10 +10,7 @@ Graphs -- Eliminate usage of global variables - graph.d/.php files all modify the global $hostname, should be a local variable -- Zooming -- graph.d/ JSON definition should allow optional metrics to be added to the graph only if they exist Views @@ -45,14 +42,9 @@ - Add polish to Graphite integration - Fix CPU report for Cluster summary. Needs to be "scaled" by number of nodes -- Support zooming Documentation - Add user guide - Add installation guide (expand on README) - Add templating guide - -New features - -- Implement aggregate graphs (line and stacked) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |