From 631b2b59a536d1115ce2c3f0dc620299ec2e45b9 Mon Sep 17 00:00:00 2001 From: Patrik Kernstock Date: Tue, 31 Dec 2019 03:51:19 +0100 Subject: [PATCH] Use logtype for access_log for IPsAndPorts too --- lib/Froxlor/Cron/Http/Nginx.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php index 3563e7e2..d2cb7ee2 100644 --- a/lib/Froxlor/Cron/Http/Nginx.php +++ b/lib/Froxlor/Cron/Http/Nginx.php @@ -226,7 +226,12 @@ class Nginx extends HttpConfigBase $aliases = " " . trim($aliases); } $this->nginx_data[$vhost_filename] .= "\t" . 'server_name ' . Settings::Get('system.hostname') . $aliases . ';' . "\n"; - $this->nginx_data[$vhost_filename] .= "\t" . 'access_log /var/log/nginx/access.log;' . "\n"; + + $logtype = 'combined'; + if (Settings::Get('system.logfiles_format') != '') { + $logtype = 'frx_custom'; + } + $this->nginx_data[$vhost_filename] .= "\t" . 'access_log /var/log/nginx/access.log ' . $logtype . ';' . "\n"; if (Settings::Get('system.use_ssl') == '1' && Settings::Get('system.leenabled') == '1' && Settings::Get('system.le_froxlor_enabled') == '1') { $acmeConfFilename = Settings::Get('system.letsencryptacmeconf');