attempting drawks pull

AUTHORS

@@ -2,3 +2,4 @@ Federico Sacerdoti <[email protected]>
 Matt Massie <[email protected]>
 Vladimir Vuksan <vvuksan>
 Jeff Buchbinder <jbuchbinder>
+Dave Rawks <drawks>

Makefile

@@ -5,8 +5,8 @@ APACHE_USER = apache
 
 # Gweb version
 GWEB_MAJOR_VERSION = 2
-GWEB_MINOR_VERSION = 1
-GWEB_MICRO_VERSION = 8
+GWEB_MINOR_VERSION = 2
+GWEB_MICRO_VERSION = 1
 
 # Gweb statedir (where RRD files, Dwoo templates are stored)
 GWEB_STATEDIR = /var/lib

api/events.php

@@ -11,11 +11,11 @@
 // Make timestamp, description and host_regex have been supplied before proceeding
 header("Content-Type: text/plain");
 
-$conf['ganglia_dir'] = dirname(dirname(__FILE__));
+$conf['gweb_root'] = dirname(dirname(__FILE__));
 
-include_once $conf['ganglia_dir'] . "/eval_conf.php";
-include_once $conf['ganglia_dir'] . "/functions.php";
-include_once $conf['ganglia_dir'] . "/lib/common_api.php";
+include_once $conf['gweb_root'] . "/eval_conf.php";
+include_once $conf['gweb_root'] . "/functions.php";
+include_once $conf['gweb_root'] . "/lib/common_api.php";
 
 if ( ! $conf['overlay_events'] ) {
   api_return_error( "Events API is DISABLED. Please set \$conf['overlay_events'] = true to enable." );

api/rundeck.php

@@ -25,14 +25,14 @@
 
 header("Content-Type: text/plain");
 
-$conf['ganglia_dir'] = dirname(dirname(__FILE__));
+$conf['gweb_root'] = dirname(dirname(__FILE__));
 
-include_once $conf['ganglia_dir'] . "/eval_conf.php";
-include_once $conf['ganglia_dir'] . "/functions.php";
-include_once $conf['ganglia_dir'] . "/get_context.php";
+include_once $conf['gweb_root'] . "/eval_conf.php";
+include_once $conf['gweb_root'] . "/functions.php";
+include_once $conf['gweb_root'] . "/get_context.php";
 $context = "cluster";
-include_once $conf['ganglia_dir'] . "/ganglia.php";
-include_once $conf['ganglia_dir'] . "/get_ganglia.php";
+include_once $conf['gweb_root'] . "/ganglia.php";
+include_once $conf['gweb_root'] . "/get_ganglia.php";
 
 foreach ( $metrics as $node => $metric_array ) {
 

api/search.php

@@ -11,11 +11,11 @@
 // will give you back the name of the cluster where host is in
 /////////////////////////////////////////////////////////////////////////////
 
-$conf['ganglia_dir'] = dirname(dirname(__FILE__));
+$conf['gweb_root'] = dirname(dirname(__FILE__));
 
-include_once $conf['ganglia_dir'] . "/eval_conf.php";
-include_once $conf['ganglia_dir'] . "/lib/common_api.php";
-include_once $conf['ganglia_dir'] . "/lib/functions.php";
+include_once $conf['gweb_root'] . "/eval_conf.php";
+include_once $conf['gweb_root'] . "/lib/common_api.php";
+include_once $conf['gweb_root'] . "/lib/functions.php";
 
 ganglia_cache_metrics();
 

api/views.php

@@ -2,11 +2,11 @@
 
 header("Content-Type: text/json");
 
-$conf['ganglia_dir'] = dirname(dirname(__FILE__));
+$conf['gweb_root'] = dirname(dirname(__FILE__));
 
-include_once $conf['ganglia_dir'] . "/eval_conf.php";
-include_once $conf['ganglia_dir'] . "/functions.php";
-include_once $conf['ganglia_dir'] . "/lib/common_api.php";
+include_once $conf['gweb_root'] . "/eval_conf.php";
+include_once $conf['gweb_root'] . "/functions.php";
+include_once $conf['gweb_root'] . "/lib/common_api.php";
 
 if ( !isset($_GET['action']) ) {
   api_return_error( "Error: You need to specify an action at a minimum" );

conf_default.php.in

@@ -3,9 +3,9 @@
 #
 # Gmetad-webfrontend version. Used to check for updates.
 #
-$conf['ganglia_dir'] = dirname(__FILE__);
+$conf['gweb_root'] = dirname(__FILE__);
 
-include_once $conf['ganglia_dir'] . "/version.php";
+include_once $conf['gweb_root'] . "/version.php";
 
 #
 # 'readonly': No authentication is required.  All users may view all resources.  No edits are allowed.
@@ -31,7 +31,8 @@ $conf['gmetad_root'] = "@varstatedir@/ganglia";
 $conf['rrds'] = "${conf['gmetad_root']}/rrds";
 
 # Where Dwoo (PHP templating engine) store compiled templates
-$conf['dwoo_compiled_dir'] = "${conf['gmetad_root']}/dwoo";
+$conf['dwoo_compiled_dir'] = "${conf['gweb_root']}/lib/dwoo/compiled";
+$conf['dwoo_cache_dir'] = "${conf['gweb_root']}/lib/dwoo/cache";
 
 # Where to store web-based configuration
 $conf['views_dir'] = $conf['gmetad_root'] . '/conf';

debian/changelog

@@ -1,6 +1,18 @@
-ganglia-webfrontend (2.2.1-1) unstable; urgency=low
+ganglia-webfrontend (2.2.1) unstable; urgency=low
 
+  [ Dave Rawks ]
+  * More tweaks to packaging to fit with debian policy
+  * Moved apache config to install in apache2's conf.d
+  * Added a conf.php which includes from /etc/ganglia-webfrontend/conf.php
+
+ -- Dave Rawks <drawks@kumonga>  Thu, 29 Dec 2011 14:42:00 -0800
+
+ganglia-webfrontend (2.2.0-0) unstable; urgency=low
+
+  [ Jeff Buchbinder ]
   * Add debian packaging.
 
- -- Jeff Buchbinder <[email protected]>  Sat, 13 Aug 2011 10:33:41 -0400
+  [ Dave Rawks ]
+  * Corrected several problems with debian packaging
 
+ -- Dave Rawks <drawks@kumonga>  Thu, 29 Dec 2011 11:27:04 -0800

debian/compat

@@ -1 +1 @@
-5
+7

debian/ganglia-webfrontend.dirs

@@ -1,2 +1,4 @@
 etc/ganglia-webfrontend
 usr/share/ganglia-webfrontend
+usr/share/ganglia-webfrontend/lib/dwoo/compiled
+usr/share/ganglia-webfrontend/lib/dwoo/cache

debian/ganglia-webfrontend.postinst

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 set -e
 
@@ -11,6 +11,9 @@ if [ "$1" = "configure" ]; then
     autoconfigure="$RET"
     webserver="apache2"
 
+    chown www-data /usr/share/ganglia-webfrontend/lib/dwoo/cache
+    chown www-data /usr/share/ganglia-webfrontend/lib/dwoo/compiled
+
     if [ "$autoconfigure" = true ]; then
         test -x /usr/sbin/$webserver || continue
 

debian/ganglia-webfrontend.postrm

@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh -x
 
 set -e
 

debian/ganglia-webfrontend.templates

@@ -9,14 +9,14 @@
 
 Template: ganglia-webfrontend/webserver
 Type: boolean
-Default: false
+Default: true
 _Description: Automatically configure apache2?
  The ganglia front-end will be unavailable until a web server is configured.
  Automatic configuration can be performed for the Apache 2 web server.
 
 Template: ganglia-webfrontend/restart
 Type: boolean
-Default: false
+Default: true
 _Description: Restart apache2?
  In order to activate the new configuration, the web server needs
  to be restarted. If you choose not to do this automatically, you should

debian/rules

@@ -22,11 +22,14 @@ override_dh_auto_clean:
 override_dh_auto_install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	# Add here commands to install the package into debian/ganglia.
 	$(MAKE) install APACHE_USER=www-data DESTDIR=$(CURDIR)/debian/tmp/usr/share/ganglia-webfrontend
 	# Install webfrontend
+	mkdir -p debian/ganglia-webfrontend/etc/apache2/conf.d/
 	cp -f debian/apache.conf \
 		 debian/ganglia-webfrontend/etc/ganglia-webfrontend
+	cp -f debian/conf.php \
+		 debian/ganglia-webfrontend/etc/ganglia-webfrontend
 

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

edit_optional_graphs.php

@@ -175,7 +175,7 @@ function create_radio_button($variable_name, $variable_value = "ignored") {
  Find available graphs by looking in the GANGLIA_DIR/graph.d directory
  anything that matches _report.php
 ----------------------------------------------------------------------- */
-if ($handle = opendir($conf['ganglia_dir'] . '/graph.d')) {
+if ($handle = opendir($conf['gweb_root'] . '/graph.d')) {
 
     // If we are using RRDtool reports can be json or PHP suffixes
     if ( $conf['graph_engine'] == "rrdtool" )

eval_conf.php

@@ -57,6 +57,11 @@
   "Please adjust <code>\$conf['dwoo_compiled_dir']</code>."; 
 }
 
+if ( ! isset($conf['dwoo_compiled_dir']) || ! is_writeable($conf['dwoo_compiled_dir']) ) {
+  $errors[] = "DWOO cache directory '${conf['dwoo_cache_dir']}' is not writeable.<br/>".
+  "Please adjust <code>\$conf['dwoo_cache_dir']</code>."; 
+}
+
 if( ! isSet($conf['views_dir']) || ! is_readable($conf['views_dir']) ) {
   $errors[] = "Views directory '${conf['views_dir']}' is not readable.<br/>".
   "Please adjust <code>\$conf['views_dir']</code>.";

functions.php

@@ -1282,9 +1282,9 @@ function ganglia_cache_metrics() {
         }
         // Set up for cluster summary
         $context = "index_array";
-        include_once $conf['ganglia_dir'] . "/functions.php";
-        include_once $conf['ganglia_dir'] . "/ganglia.php";
-        include_once $conf['ganglia_dir'] . "/get_ganglia.php";
+        include_once $conf['gweb_root'] . "/functions.php";
+        include_once $conf['gweb_root'] . "/ganglia.php";
+        include_once $conf['gweb_root'] . "/get_ganglia.php";
 
         foreach ( $index_array['cluster'] as $hostname => $elements ) {
             $hosts[] = $hostname;
@@ -1431,7 +1431,7 @@ function retrieve_metrics_cache () {
       }
       // Set up for cluster summary
       $context = "index_array";
-      include_once $conf['ganglia_dir'] . "/ganglia.php";
+      include_once $conf['gweb_root'] . "/ganglia.php";
       Gmetad($conf['ganglia_ip'], $conf['ganglia_port']);
 
       foreach ( $index_array['cluster'] as $hostname => $elements ) {