From e0f7fcd2efeb9d2127c3d514ad62d9bf6803ab8b Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 29 Jan 2023 15:58:49 +0100 Subject: [PATCH] fix awstats path in generated vhost config if speciallogfile=0 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/Apache.php | 4 ++++ lib/Froxlor/Cron/Http/Lighttpd.php | 4 ++++ lib/Froxlor/Cron/Http/Nginx.php | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/lib/Froxlor/Cron/Http/Apache.php b/lib/Froxlor/Cron/Http/Apache.php index 03e0dc28..b148e187 100644 --- a/lib/Froxlor/Cron/Http/Apache.php +++ b/lib/Froxlor/Cron/Http/Apache.php @@ -1034,6 +1034,10 @@ class Apache extends HttpConfigBase $statTool = Settings::Get('system.traffictool'); $statDomain = ""; + if ($statTool == 'awstats') { + // awstats generates for each domain regardless of speciallogfile + $statDomain = "/" . $domain['domain']; + } if ($domain['speciallogfile'] == '1') { $statDomain = "/" . (($domain['parentdomainid'] == '0') ? $domain['domain'] : $domain['parentdomain']); } diff --git a/lib/Froxlor/Cron/Http/Lighttpd.php b/lib/Froxlor/Cron/Http/Lighttpd.php index 64d38611..ee79b3dd 100644 --- a/lib/Froxlor/Cron/Http/Lighttpd.php +++ b/lib/Froxlor/Cron/Http/Lighttpd.php @@ -719,6 +719,10 @@ class Lighttpd extends HttpConfigBase $statTool = Settings::Get('system.traffictool'); $statDomain = ""; + if ($statTool == 'awstats') { + // awstats generates for each domain regardless of speciallogfile + $statDomain = "/" . $domain['domain']; + } if ($domain['speciallogfile'] == '1') { $statDomain = "/" . (($domain['parentdomainid'] == '0') ? $domain['domain'] : $domain['parentdomain']); } diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php index 7f23d653..12286c7e 100644 --- a/lib/Froxlor/Cron/Http/Nginx.php +++ b/lib/Froxlor/Cron/Http/Nginx.php @@ -1120,6 +1120,10 @@ class Nginx extends HttpConfigBase $statTool = Settings::Get('system.traffictool'); $statDomain = ""; + if ($statTool == 'awstats') { + // awstats generates for each domain regardless of speciallogfile + $statDomain = "/" . $domain['domain']; + } if ($domain['speciallogfile'] == '1') { $statDomain = "/" . (($domain['parentdomainid'] == '0') ? $domain['domain'] : $domain['parentdomain']); }