- simplify awstats configuration, fixes #241

lib/configfiles/etch.inc.php

@@ -273,10 +273,8 @@ return Array(
 						'commands' => Array(
 							'apt-get install awstats',
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-						),
+							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
-						'files' => Array(
-							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/freebsd.inc.php

@@ -198,10 +198,13 @@ return Array(
 						'commands' => Array(
 							'cd /usr/ports/www/awstats/',
 							'make install clean',
-							'cp /usr/local/www/awstats/cgi-bin/awstats.model.conf '.makeCorrectDir($settings['system']['awstats_conf'])
+							'cp /usr/local/www/awstats/cgi-bin/awstats.model.conf '.makeCorrectDir($settings['system']['awstats_conf']),
-						),
+							'sed -i.bak \'s/^LogFile/# LogFile/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
-						'files' => Array(
+							'sed -i.bak \'s/^LogType/# LogType/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
-							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'sed -i.bak \'s/^LogFormat/# LogFormat/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
+							'sed -i.bak \'s/^LogSeparator/# LogSeparator/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
+							'sed -i.bak \'s/^SiteDomain/# SiteDomain/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf'),
+							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf')
 						)
 					),
 					'libnss' => Array(

lib/configfiles/gentoo.inc.php

@@ -320,10 +320,8 @@ milter_default_action = accept" >> /etc/postfix/main.cf'
 						'label' => 'Awstats',
 						'commands' => Array(
 							'emerge awstats',
-							'awstats_configure.pl'
+							'awstats_configure.pl',
-						),
+							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
-						'files' => Array(
-							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/hardy.inc.php

@@ -298,10 +298,8 @@ return Array(
 						'commands' => Array(
 							'apt-get install awstats',
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-						),
+							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
-						'files' => Array(
-							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/lenny.inc.php

@@ -306,10 +306,8 @@ return Array(
 						'commands' => Array(
 							'apt-get install awstats',
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-						),
+							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
-						'files' => Array(
-							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/lucid.inc.php

@@ -307,10 +307,8 @@ return Array(
 						'commands' => Array(
 							'apt-get install awstats',
 							'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/',
-							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							'mv '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-						),
+							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
-						'files' => Array(
-							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						),
 					),
 					'libnss' => Array(

lib/configfiles/suse10.inc.php

@@ -154,10 +154,8 @@ return Array(
 						'label' => 'Awstats',
 						'commands' => Array(
 							'awstats_configure.pl',
-							makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
+							makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf'),
-						),
+							'sed -i.bak \'s/^DirData/# DirData/\''.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
-						'files' => Array(
-							'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf')
 						)
 					)
 				)

templates/misc/configfiles/debian_etch/awstats/etc_awstats.model.conf

@@ -1,8 +0,0 @@
-# for Froxlor and AWStats to work together
-# you have to change the following line
-
-# look for 
-DirData="/some/folder/"
-
-# and comment this out with a hash (#)
-#DirData="/some/folder/"

templates/misc/configfiles/debian_lenny/awstats/etc_awstats.model.conf

@@ -1,8 +0,0 @@
-# for Froxlor and AWStats to work together
-# you have to change the following line
-
-# look for 
-DirData="/some/folder/"
-
-# and comment this out with a hash (#)
-#DirData="/some/folder/"

templates/misc/configfiles/freebsd/awstats/etc_awstats.model.conf

@@ -1,19 +0,0 @@
-# for Froxlor and AWStats to work together
-# you have to comment out the following
-# variables
-
-# look for
-LogFile=""
-LogType=""
-LogFormat=""
-LogSeparator=""
-SiteDomain=""
-DirData="/some/folder/"
-
-# and comment this out with a hash (#)
-#LogFile=""
-#LogType=""
-#LogFormat=""
-#LogSeparator=""
-#SiteDomain=""
-#DirData="/some/folder/"

templates/misc/configfiles/gentoo/awstats/etc_awstats.model.conf

@@ -1,8 +0,0 @@
-# for Froxlor and AWStats to work together
-# you have to change the following line
-
-# look for 
-DirData="/some/folder/"
-
-# and comment this out with a hash (#)
-#DirData="/some/folder/"

templates/misc/configfiles/suse_linux_10_0/awstats/etc_awstats.model.conf

@@ -1,8 +0,0 @@
-# for Froxlor and AWStats to work together
-# you have to change the following line
-
-# look for 
-DirData="/some/folder/"
-
-# and comment this out with a hash (#)
-#DirData="/some/folder/"

templates/misc/configfiles/ubuntu_hardy/awstats/etc_awstats.model.conf

@@ -1,8 +0,0 @@
-# for Froxlor and AWStats to work together
-# you have to change the following line
-
-# look for 
-DirData="/some/folder/"
-
-# and comment this out with a hash (#)
-#DirData="/some/folder/"

templates/misc/configfiles/ubuntu_lucid/awstats/etc_awstats.model.conf

@@ -1,8 +0,0 @@
-# for Froxlor and AWStats to work together
-# you have to change the following line
-
-# look for 
-DirData="/some/folder/"
-
-# and comment this out with a hash (#)
-#DirData="/some/folder/"