[Ganglia-svn] SF.net SVN: ganglia:[2538] branches/monitor-web-2.0

[<vv...@us...>]

Revision: 2538
          http://ganglia.svn.sourceforge.net/ganglia/?rev=2538&view=rev
Author:   vvuksan
Date:     2011-03-27 21:19:15 +0000 (Sun, 27 Mar 2011)

Log Message:
-----------
Add a blurb about configuration

Modified Paths:
--------------
    branches/monitor-web-2.0/COPYING
    branches/monitor-web-2.0/README
    branches/monitor-web-2.0/TODO
    branches/monitor-web-2.0/gweb.spec.in

Modified: branches/monitor-web-2.0/COPYING
===================================================================
--- branches/monitor-web-2.0/COPYING	2011-03-27 21:07:31 UTC (rev 2537)
+++ branches/monitor-web-2.0/COPYING	2011-03-27 21:19:15 UTC (rev 2538)
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2011, The Regents of the University of California
+Copyright (c) 2001-2010, The Regents of the University of California
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Modified: branches/monitor-web-2.0/README
===================================================================
--- branches/monitor-web-2.0/README	2011-03-27 21:07:31 UTC (rev 2537)
+++ branches/monitor-web-2.0/README	2011-03-27 21:19:15 UTC (rev 2538)
@@ -1,10 +1,32 @@
 This is an attempt to make the Ganglia UI more usable. You should be able to drop this into
-your $HTTPD_ROOT/ganglia then run make to generate conf.php.
+your $HTTPD_ROOT/ganglia then run make to generate conf_default.php. make install will
+create all the 
 
-Please modify Makefile to point the directory where you installed the code. Also note
-that Makefile will create directories /var/lib/ganglia/rrds and /var/lib/ganglia/dwoo
-which are required for UI to function.
+Configuration
+=============
 
+All the configuration options are in conf_default.php. You can override any of the values by
+creating and editing conf.php. If you want to use standard directories such as 
+
+/var/lib/ganglia/rrds for RRDs
+
+and
+
+/var/lib/ganglia/dwoo
+
+for DWOO (templating engine) compiled templates you don't need to do anything. If however you
+want to change it create a conf.php like this
+
+<?php
+
+$conf['rrds'] = "/my/rrds";
+$conf['dwoo_compiled_dir'] = "/my/dwoo";
+
+?>
+
+This will make the upgrade process much easier since upgrade will not clobber your custom
+conf.php.
+
 New features
 ============
 

Modified: branches/monitor-web-2.0/TODO
===================================================================
--- branches/monitor-web-2.0/TODO	2011-03-27 21:07:31 UTC (rev 2537)
+++ branches/monitor-web-2.0/TODO	2011-03-27 21:19:15 UTC (rev 2538)
@@ -5,8 +5,6 @@
 - Centralize sanitization of user input (Extract this from get_context.php and graph.php, no other scripts
   should use $_GET directly)
 - Make indentation consistent - mixed usage of 2 spaces, 3 spaces, 4 spaces, or tabs makes code harder to read
-- In Cluster Report, when one clicks on the text box besides "Metric", it should bring up a dropbox with a 
-  list of paginated metrics and continue to show metric name hints as you type
 
 Graphs
 

Modified: branches/monitor-web-2.0/gweb.spec.in
===================================================================
--- branches/monitor-web-2.0/gweb.spec.in	2011-03-27 21:07:31 UTC (rev 2537)
+++ branches/monitor-web-2.0/gweb.spec.in	2011-03-27 21:19:15 UTC (rev 2538)
@@ -54,7 +54,7 @@
 #%dir %{web_prefixdir}/img
 #%dir %{web_prefixdir}/js
 %{web_prefixdir}/*
-%config(noreplace) %{web_prefixdir}/conf_default.php
+%config(noreplace) %{web_prefixdir}/conf.php
 #%{web_prefixdir}/conf/*
 #%{web_prefixdir}/css/*
 #%{web_prefixdir}/dwoo/*
@@ -65,7 +65,5 @@
 %__rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Mar 17 2011 Bernard Li <be...@va...>
-- Renamed conf.php -> conf_default.php
 * Fri Dec 17 2010 Bernard Li <be...@va...>
 - Spec file for gweb which is split from ganglia-web subpackage


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