From 62fa764b4c40553f999b39ed2b4924429556333f Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 26 Apr 2010 06:32:40 +0000 Subject: [PATCH] fix some awstats config-file namings for debian-bases distros and suse, fixes #165 --- lib/configfiles/etch.inc.php | 5 +++-- lib/configfiles/hardy.inc.php | 5 +++-- lib/configfiles/lenny.inc.php | 5 +++-- lib/configfiles/suse10.inc.php | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/configfiles/etch.inc.php b/lib/configfiles/etch.inc.php index 94ec34fe..6b69e3eb 100644 --- a/lib/configfiles/etch.inc.php +++ b/lib/configfiles/etch.inc.php @@ -272,10 +272,11 @@ return Array( 'label' => 'Awstats', 'commands' => Array( 'apt-get install awstats', - 'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/' + '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') ), 'files' => Array( - 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf') + 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf') ), ), 'libnss' => Array( diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php index 89c3a2ed..90b23346 100644 --- a/lib/configfiles/hardy.inc.php +++ b/lib/configfiles/hardy.inc.php @@ -266,10 +266,11 @@ return Array( 'label' => 'Awstats', 'commands' => Array( 'apt-get install awstats', - 'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/' + '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') ), 'files' => Array( - 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf') + 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf') ), ), 'libnss' => Array( diff --git a/lib/configfiles/lenny.inc.php b/lib/configfiles/lenny.inc.php index e350fe89..43d738fb 100644 --- a/lib/configfiles/lenny.inc.php +++ b/lib/configfiles/lenny.inc.php @@ -273,10 +273,11 @@ return Array( 'label' => 'Awstats', 'commands' => Array( 'apt-get install awstats', - 'cp /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/lib/cgi-bin/' + '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') ), 'files' => Array( - 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf') + 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf') ), ), 'libnss' => Array( diff --git a/lib/configfiles/suse10.inc.php b/lib/configfiles/suse10.inc.php index 401b7095..6ac649a3 100644 --- a/lib/configfiles/suse10.inc.php +++ b/lib/configfiles/suse10.inc.php @@ -153,10 +153,11 @@ return Array( 'awstats' => Array( 'label' => 'Awstats', 'commands' => Array( - 'awstats_configure.pl' + 'awstats_configure.pl', + makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf').' '.makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf') ), 'files' => Array( - 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.conf') + 'etc_awstats.model.conf' => makeCorrectFile($settings['system']['awstats_conf'].'/awstats.model.conf') ) ) )