Merge lp:~mbruzek/charms/precise/ganglia/apache2fix into lp:charms/ganglia

[Matt Bruzek]

Apache2 changed how they enable sites, this fixes that problem. Tested on precise and trusty.

[Matt Bruzek (mbruzek)]

I found a bug when deploying ganglia in trusty. The fix works for both trusty and precise (I tested it).

Please review and let me know.

Thanks!

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2012-10-04 15:04:38 +0000
+++ hooks/hooks.py	2014-04-10 15:43:39 +0000
@@ -111,7 +111,8 @@
         control(GMOND, RESTART)
 
 
-APACHE_CONFIG = "/etc/apache2/conf.d/ganglia.conf"
+#APACHE_CONFIG = "/etc/apache2/conf.d/ganglia.conf"
+APACHE_CONFIG = "/etc/apache2/sites-available/ganglia.conf"
 GANGLIA_APACHE_CONFIG = "/etc/ganglia-webfrontend/apache.conf"
 
 
@@ -119,6 +120,11 @@
     juju_log("INFO", "Configuring apache vhost for ganglia master")
     if not os.path.exists(APACHE_CONFIG):
         os.symlink(GANGLIA_APACHE_CONFIG, APACHE_CONFIG)
+	command = [ 'a2ensite', os.path.basename(APACHE_CONFIG) ]
+        code = subprocess.call(command)
+        if code != 0:
+            juju-log("ERROR", "Unable to configure apache2")
+            exit(code)
     control(APACHE, RELOAD)