maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Changes related to missing awstats icon location block in Nginx vhosts and Awstats configuration on Gentoo

Browse Source 
fixes #1228
fixed #1229
This commit is contained in:
Florian Lahr
2013-06-06 14:49:21 +02:00
parent fc4a93ff6e
commit a3ee1430ac
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/configfiles/gentoo.inc.php
View File

@@ -394,6 +394,7 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
'commands' => Array( 'commands' => Array(
'emerge awstats', 'emerge awstats',
'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'), 'sed -i.bak \'s/^DirData/# DirData/\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'sed -i.bak \'s|^\\(DirIcons=\\).*$|\\1\\"/awstats-icon\\"|\' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
'# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself', '# Please make sure you deactivate awstats own cronjob as Froxlor handles that itself',
'rm /etc/cron.d/awstats' 'rm /etc/cron.d/awstats'
), ),

7
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -698,6 +698,13 @@ class nginx
$stats_text .= "\t\t" . 'auth_basic_user_file ' . makeCorrectFile($single['usrf']) . ';'."\n"; $stats_text .= "\t\t" . 'auth_basic_user_file ' . makeCorrectFile($single['usrf']) . ';'."\n";
$stats_text .= "\t" . '}' . "\n\n"; $stats_text .= "\t" . '}' . "\n\n";
// awstats icons
if ($this->settings['system']['awstats_enabled'] == '1') {
$stats_text .= "\t" . 'location ~ ^/awstats-icon/(.*)$ {' . "\n";
$stats_text .= "\t\t" . 'alias ' . makeCorrectDir($this->settings['system']['awstats_icons']) . '$1;' . "\n";
$stats_text .= "\t" . '}' . "\n\n";
}
return $stats_text; return $stats_text;
} }