Merge pull request #220 from noelmcloughlin/issue122

Do not add ServerAlias unless defined

apache/vhosts/minimal.tmpl

@@ -9,7 +9,7 @@
     'port': site.get('port', '80'),
 
     'ServerName': sitename,
-    'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
+    'ServerAlias': site.get('ServerAlias', ''),
 
     'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),
 

apache/vhosts/proxy.tmpl

@@ -9,7 +9,7 @@
     'port': site.get('port', '80'),
 
     'ServerName': sitename,
-    'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
+    'ServerAlias': site.get('ServerAlias', ''),
 
     'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),
 

apache/vhosts/redirect.tmpl

@@ -10,7 +10,7 @@
     'port': site.get('port', '80'),
 
     'ServerName': sitename,
-    'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
+    'ServerAlias': site.get('ServerAlias', ''),
 
     'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),
 

apache/vhosts/standard.tmpl

@@ -9,7 +9,7 @@
     'port': site.get('port', '80'),
 
     'ServerName': sitename,
-    'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
+    'ServerAlias': site.get('ServerAlias', ''),
 
     'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),
 

pillar.example

@@ -62,7 +62,7 @@ apache:
       exclude_listen_directive: True # Do not add a Listen directive in httpd.conf
 
       ServerName: example.com # uses the unique ID above unless specified
-      ServerAlias: www.example.com
+      #ServerAlias: www.example.com # Do not add ServerAlias unless defined
 
       ServerAdmin: webmaster@example.com