Merge lp:~jjo/charms/precise/apache2/support-apache24-sites-conf-files into lp:charms/apache2

[JuanJo Ciarlante]

[jjo] support apache 2.4 site setup
- 2.4 requires sites-available/foo.conf filenames
- cleanup a couple bits

[JuanJo Ciarlante (jjo)]

FYI merged from canonical-is repository - passes CID testing for precise, trusty.

[Charles Butler (lazypower)]

Greetings JuanJo,

I've reviewed these changes and they look good to me. I've pulled the source and deployed the charm with your patches, everything passes my initial testing.

+1 vote on this MP

Another charmer should be by shortly to perform another review, and put you that much closer to having this patch accepted into the charm store.

Thanks for the patch!

[Marco Ceppi (marcoceppi)]

LGTM, thanks!

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-01-16 12:33:28 +0000
+++ hooks/hooks.py	2014-01-20 16:44:14 +0000
@@ -26,7 +26,6 @@
 # Global variables
 ###############################################################################
 default_apache2_service_config_dir = "/var/run/apache2"
-test_apache2_vhost = "/etc/apache2/sites-available/testvhost"
 service_affecting_packages = ['apache2']
 default_apache22_config_dir = "/etc/apache2/conf.d"
 default_apache24_config_dir = "/etc/apache2/conf-available"
@@ -139,12 +138,23 @@
     return os.path.exists("/usr/sbin/a2enconf")
 
 
+def site_filename(name, enabled=False):
+    if enabled:
+        sites_dir = "/etc/apache2/sites-enabled"
+    else:
+        sites_dir = "/etc/apache2/sites-available"
+
+    if is_apache24():
+        return "{}/{}.conf".format(sites_dir, name)
+    else:
+        return "{}/{}".format(sites_dir, name)
+
+
 def conf_filename(name):
     """Return an apache2 config filename path, as:
       2.4: /etc/apache2/conf-available/foo.conf
       2.2: /etc/apache2/conf.d/foo
     """
-    # Check for conf.d presence (instead of parsing apache2ctl -V, etc)
     if is_apache24():
         return "{}/{}.conf".format(default_apache24_config_dir, name)
     else:
@@ -402,7 +412,11 @@
 
     relationship_data.update(get_reverseproxy_data(relation='reverseproxy'))
     relationship_data.update(get_reverseproxy_data(relation='website-cache'))
-    update_balancers()
+    if update_balancers():
+        # apache 2.4 has lbmethods split, needs to enable specific module(s)
+        if is_apache24():
+            enable_module('lbmethod_byrequests')
+
     if config_data['enable_modules']:
         module_list = config_data['enable_modules'].split()
         for module in module_list:
@@ -428,7 +442,7 @@
         close_port(ports[proto])
         if template_var in config_data:
             vhost_name = '%s_%s' % (config_data['servername'], proto)
-            vhost_file = '/etc/apache2/sites-available/%s' % (vhost_name)
+            vhost_file = site_filename(vhost_name)
             from jinja2 import Template
             template = Template(
                 str(base64.b64decode(config_data[template_var])))
@@ -539,7 +553,7 @@
     # Disable the default website because we don't want people to see the
     # "It works!" page on production services and remove the
     # conf.d/other-vhosts-access-log conf.
-    if os.path.exists("/etc/apache2/sites-enabled/000-default"):
+    if os.path.exists(site_filename("000-default", True)):
         run(["/usr/sbin/a2dissite", "000-default"])
     conf_disable("other-vhosts-access-log")
     if os.path.exists(conf_filename("other-vhosts-access-log")):