Actually fix CustomLog default values in templates

apache/vhosts/minimal.tmpl

@@ -28,5 +28,7 @@
 
     {% if site.get('LogLevel') != False -%}LogLevel {{ vals.LogLevel }}{% endif %}
     {% if site.get('ErrorLog') != False -%}ErrorLog {{ vals.ErrorLog }}{% endif %}
-    {% if site.get('CustomLog') != False -%}CustomLog {{ vals.CustomLog }} {{ vals.LogFormat }}{% endif %}
+    {% if site.get('LogFormat') != False -%}LogFormat {{ vals.LogFormat }}{% endif %}
+    {% if site.get('CustomLog') != False -%}LogFormat {{ vals.LogFormat }} {{ sitename }}
+    CustomLog {{ vals.CustomLog }} {{ sitename }}{% endif %}
 </VirtualHost>

apache/vhosts/proxy.tmpl

@@ -40,7 +40,9 @@
 
     {% if site.get('LogLevel') != False %}LogLevel {{ vals.LogLevel }}{% endif %}
     {% if site.get('ErrorLog') != False %}ErrorLog {{ vals.ErrorLog }}{% endif %}
-    {% if site.get('CustomLog') != False %}CustomLog {{ vals.CustomLog }} {{ vals.LogFormat }}{% endif %}
+    {% if site.get('LogFormat') != False -%}LogFormat {{ vals.LogFormat }}{% endif %}
+    {% if site.get('CustomLog') != False -%}LogFormat {{ vals.LogFormat }} {{ sitename }}
+    CustomLog {{ vals.CustomLog }} {{ sitename }}{% endif %}
 
     {% if site.get('SSLCertificateFile') %}SSLEngine on
     SSLCertificateFile {{ site.SSLCertificateFile }}

apache/vhosts/redirect.tmpl

@@ -32,7 +32,9 @@
 
     {% if site.get('LogLevel') != False %}LogLevel {{ vals.LogLevel }}{% endif %}
     {% if site.get('ErrorLog') != False %}ErrorLog {{ vals.ErrorLog }}{% endif %}
-    {% if site.get('CustomLog') != False %}CustomLog {{ vals.CustomLog }} {{ vals.LogFormat }}{% endif %}
+    {% if site.get('LogFormat') != False -%}LogFormat {{ vals.LogFormat }}{% endif %}
+    {% if site.get('CustomLog') != False -%}LogFormat {{ vals.LogFormat }} {{ sitename }}
+    CustomLog {{ vals.CustomLog }} {{ sitename }}{% endif %}
 
     Redirect {{ vals.RedirectSource }} {{ vals.RedirectTarget }}
 

apache/vhosts/standard.tmpl

@@ -53,7 +53,8 @@
     {% if site.get('LogLevel') != False -%}LogLevel {{ vals.LogLevel }}{% endif %}
     {% if site.get('ErrorLog') != False -%}ErrorLog {{ vals.ErrorLog }}{% endif %}
     {% if site.get('LogFormat') != False -%}LogFormat {{ vals.LogFormat }}{% endif %}
-    {% if site.get('CustomLog') != False -%}CustomLog {{ vals.CustomLog }} {% endif %}
+    {% if site.get('CustomLog') != False -%}LogFormat {{ vals.LogFormat }} {{ sitename }}
+    CustomLog {{ vals.CustomLog }} {{ sitename }}{% endif %}
 
     {% if site.get('DocumentRoot') != False -%}DocumentRoot {{ vals.DocumentRoot }}{% endif %}
     {% if site.get('VirtualDocumentRoot') -%}VirtualDocumentRoot {{ vals.VirtualDocumentRoot }}{% endif %}