Add a new auto-www option to the apache recipe

Author: John Carr

isotoma.recipe.apache/README.rst

@@ -48,6 +48,8 @@ sslcert
     The full pathname of the ssl certificate, if required
 sslkey
     The full pathname of the key for the ssl certificate
+auto-www
+    If true, the recipe will have a ServerAlias for www.${sitename}. If your sitename already has a www prefix, the alias will be sitename with the prefix trimmed.
 
 Repository
 ----------

isotoma.recipe.apache/isotoma/recipe/apache/__init__.py

@@ -52,9 +52,18 @@ def install(self):
         if not os.path.isdir(self.outputdir):
             os.mkdir(self.outputdir)
         opt = self.options.copy()
+
         # turn a list of sslca's into an actual list
         opt['sslca'] = [x.strip() for x in opt.get("sslca", "").strip().split()]
         opt['aliases'] = [x.strip() for x in opt.get('aliases', '').strip().split()]
+
+        # if we have auto-www on, add additional alias:
+        if self.options.get("auto-www", "False") == "True":
+            if opt['sitename'].startswith("www."):
+                opt['aliases'].append(opt['sitename'][4:])
+            else:
+                opt['aliases'].append("www.%s" % opt['sitename'])
+
         template = open(self.options['template']).read()
         cfgfilename = self.options['configfile']
         c = Template(template, searchList = opt)
@@ -67,6 +76,6 @@ def mkpasswd(self):
             pw = htpasswd.HtpasswdFile(self.options['passwdfile'], create=True)
             pw.update(self.options["username"], self.options["password"])
             pw.save()
-        
+
     def update(self):
         pass

isotoma.recipe.apache/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.0.10'
+version = '0.0.11'
 
 setup(
     name = 'isotoma.recipe.apache',