Merging my branch and d00ps branches to trunk

2010-01-22 07:43:29 +00:00
parent 8c55dd6c21
commit eeec43ebd7
119 changed files with 1137 additions and 1589 deletions
--- a/lib/functions/syscp/function.createAWStatsConf.php
+++ b/lib/functions/syscp/function.createAWStatsConf.php
@@ -52,7 +52,7 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases)
 	// File names

 	$domain_file = '/etc/awstats/awstats.' . $siteDomain . '.conf';
-	$model_file = '/etc/awstats/awstats.model.conf.syscp';
+	$model_file = '/etc/awstats/awstats.model.conf.froxlor';

 	// Test if the file exists