Merge branch '559-dev' into 'develop'

Fix dontlog vulnerability (Backport from !559)

See merge request ispconfig/ispconfig3!1165

Author: Till Brehm

install/tpl/apache_ispconfig.conf.master

@@ -12,10 +12,10 @@ SetEnvIf Request_URI "^/datalogstatus.php$" dontlog
 
 LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
 <tmpl_if name='logging' op='==' value='anon'>
-CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -p -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
+CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -p -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
 </tmpl_if>
 <tmpl_if name='logging' op='==' value='yes'>
-CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
+CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
 </tmpl_if>
 
 <Directory /var/www/clients>

server/conf/apache_ispconfig.conf.master

@@ -7,10 +7,10 @@ SetEnvIf Request_URI "^/datalogstatus.php$" dontlog
 
 LogFormat "%v %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
 <tmpl_if name='logging' op='==' value='anon'>
-CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -p -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
+CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -p -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
 </tmpl_if>
 <tmpl_if name='logging' op='==' value='yes'>
-CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig env=!dontlog
+CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m%d-access.log\" /var/log/ispconfig/httpd" combined_ispconfig
 </tmpl_if>
 
 <Directory /var/www/clients>