- make path to awstats configuration folder a setting (again), fixes #125

lib/configfiles/etch.inc.php

@@ -273,7 +273,7 @@ return Array(
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/'
 						),
 						'files' => Array(
-							'etc_awstats.model.conf' => '/etc/awstats/awstats.conf'
+							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/gentoo.inc.php

@@ -288,7 +288,7 @@ milter_default_action = accept" >> /etc/postfix/main.cf'
 							'awstats_configure.pl'
 						),
 						'files' => Array(
-							'etc_awstats.model.conf' => '/etc/awstats/awstats.model.conf'
+							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/hardy.inc.php

@@ -267,7 +267,7 @@ return Array(
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/'
 						),
 						'files' => Array(
-							'etc_awstats.model.conf' => '/etc/awstats/awstats.model.conf'
+							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/lenny.inc.php

@@ -274,7 +274,7 @@ return Array(
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/'
 						),
 						'files' => Array(
-							'etc_awstats.model.conf' => '/etc/awstats/awstats.conf'
+							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/suse10.inc.php

@@ -154,7 +154,7 @@ return Array(
 							'awstats_configure.pl'
 						),
 						'files' => Array(
-							'etc_awstats.model.conf' => '/etc/awstats/awstats.conf'
+							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf')
 						)
 					)
 				)

lib/functions/froxlor/function.createAWStatsConf.php

@@ -48,18 +48,20 @@ function createAWStatsConf($logFile, $siteDomain, $hostAliases, $customerDocroot
 		'/\{LOG_FILE\}/',
 		'/\{SITE_DOMAIN\}/',
 		'/\{HOST_ALIASES\}/',
-		'/\{CUSTOMER_DOCROOT\}/'
+		'/\{CUSTOMER_DOCROOT\}/',
+		'/\{AWSTATS_CONF\}/'
 	);
 	$replace = array(
 		makeCorrectFile($logFile),
 		$siteDomain,
 		$hostAliases,
-		$awstats_dir
+		$awstats_dir,
+		makeCorrectDir($settings['system']['awstats_conf'])
 	);
 
 	// File names
 
-	$domain_file = '/etc/awstats/awstats.' . $siteDomain . '.conf';
+	$domain_file = makeCorrectFile($settings['system']['awstats_conf'].'/awstats.' . $siteDomain . '.conf');
 	$model_file = dirname(dirname(dirname(dirname(__FILE__))));
 	$model_file.= '/templates/misc/awstatsmodel/';