fix(vhosts): replace %O with %b in default LogFormat

%O needs mod_logio, which isn't enabled by default everywhere, so it also shouldn't be used as default fallback LogFormat.
saltstack-formulas · Oct 14, 2020 · 2b52e11 · 2b52e11
1 parent 47ec5fc
commit 2b52e11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apache/config/vhosts/proxy.tmpl b/apache/config/vhosts/proxy.tmpl
@@ -16,7 +16,7 @@
 
     'LogLevel': site.get('LogLevel', 'warn'),
     'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)),
-    'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %O \\"%{Referer}i\\" \\"%{User-Agent}i\\""'),
+    'LogFormat': site.get('LogFormat', '"%a %l %u %t \\"%r\\" %>s %b \\"%{Referer}i\\" \\"%{User-Agent}i\\""'),
     'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
 
     'ProxyRequests': site.get('ProxyRequests', 'Off'),

diff --git a/apache/config/vhosts/redirect.tmpl b/apache/config/vhosts/redirect.tmpl
@@ -17,7 +17,7 @@
 
     'LogLevel': site.get('LogLevel', 'warn'),
     'ErrorLog': site.get('ErrorLog', '{0}/{1}-error.log'.format(map.logdir, sitename)),
-    'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %O"'),
+    'LogFormat': site.get('LogFormat', '"%h %l %u %t \\\"%r\\\" %>s %b"'),
     'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
 
     'RedirectSource': site.get('RedirectSource', '/'),