From 2b52e11a8a91b0837a442bac816e7383dbe6fb13 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 14 Oct 2020 02:57:00 +0200 Subject: [PATCH] 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. --- apache/config/vhosts/proxy.tmpl | 2 +- apache/config/vhosts/redirect.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/config/vhosts/proxy.tmpl b/apache/config/vhosts/proxy.tmpl index 740f169..b9cc934 100644 --- 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 index 8f91b1c..4ccbd3d 100644 --- 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', '/'),