From 7b4a34ee69fc9508d892c1a64439475a6432108f Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Wed, 16 Jun 2010 11:34:48 +0000 Subject: [PATCH] - use system-settings of awstats-path for configuration-commands, fixes #275 --- lib/configfiles/etch.inc.php | 2 +- lib/configfiles/hardy.inc.php | 2 +- lib/configfiles/lenny.inc.php | 2 +- lib/configfiles/lucid.inc.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/configfiles/etch.inc.php b/lib/configfiles/etch.inc.php index b28cd67a..19f242ff 100644 --- a/lib/configfiles/etch.inc.php +++ b/lib/configfiles/etch.inc.php @@ -272,7 +272,7 @@ 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 '.makeCorrectDir($settings['system']['awstats_path']), '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') ), diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php index adb50a8c..e59360af 100644 --- a/lib/configfiles/hardy.inc.php +++ b/lib/configfiles/hardy.inc.php @@ -297,7 +297,7 @@ 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 '.makeCorrectDir($settings['system']['awstats_path']), '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') ), diff --git a/lib/configfiles/lenny.inc.php b/lib/configfiles/lenny.inc.php index 976ec5fe..00c1d9f9 100644 --- a/lib/configfiles/lenny.inc.php +++ b/lib/configfiles/lenny.inc.php @@ -305,7 +305,7 @@ 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 '.makeCorrectDir($settings['system']['awstats_path']), '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') ), diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php index 83d07483..0abfc2b9 100644 --- a/lib/configfiles/lucid.inc.php +++ b/lib/configfiles/lucid.inc.php @@ -306,7 +306,7 @@ 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 '.makeCorrectDir($settings['system']['awstats_path']), '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') ),