1 diff -Nur b.awstats-6.6/tools/awstats_buildstaticpages.pl n.awstats-6.6/tools/awstats_buildstaticpages.pl
2 --- b.awstats-6.6/tools/awstats_buildstaticpages.pl 2006-02-08 23:26:14.000000000 +0100
3 +++ n.awstats-6.6/tools/awstats_buildstaticpages.pl 2007-01-16 13:15:15.000000000 +0100
5 my @PossibleConfigDir=();
7 if ($configdir) { @PossibleConfigDir=("$configdir"); }
8 - else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
9 + else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
12 $FileConfig=$FileSuffix='';
14 # Check if AWSTATS prog is found
16 if (-s "$Awstats") { $AwstatsFound=1; }
17 -elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
18 - $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
19 +elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
20 + $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
23 if (! $AwstatsFound) {
24 diff -Nur b.awstats-6.6/tools/awstats_configure.pl n.awstats-6.6/tools/awstats_configure.pl
25 --- b.awstats-6.6/tools/awstats_configure.pl 2006-02-08 23:26:14.000000000 +0100
26 +++ n.awstats-6.6/tools/awstats_configure.pl 2007-01-16 13:15:15.000000000 +0100
31 -$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
32 -$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
33 -$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
34 -$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
35 -$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux
36 +$AWSTATS_ICON_PATH='/usr/share/awstats/wwwroot/icon';
37 +$AWSTATS_CSS_PATH='/usr/share/awstats/wwwroot/css';
38 +$AWSTATS_CLASSES_PATH='/usr/share/awstats/wwwroot/classes';
39 +$AWSTATS_CGI_PATH='/usr/share/awstats/wwwroot/cgi-bin';
40 +$AWSTATS_MODEL_CONFIG='/etc/webapps/awstats/awstats.model.conf'; # Used only when configure ran on linux
41 $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
46 print "Directory path to store config file(s) (Enter for default):\n> ";
47 $bidon=<STDIN>; chomp $bidon;
48 - if (! $bidon) { $bidon = "/etc/awstats"; }
49 + if (! $bidon) { $bidon = "/etc/webapps/awstats"; }
51 if (! -d $configdir) {
52 # Create the directory for config files
53 diff -Nur b.awstats-6.6/tools/awstats_updateall.pl n.awstats-6.6/tools/awstats_updateall.pl
54 --- b.awstats-6.6/tools/awstats_updateall.pl 2006-07-24 01:57:48.000000000 +0200
55 +++ n.awstats-6.6/tools/awstats_updateall.pl 2007-01-16 13:15:15.000000000 +0100
57 my $VERSION="1.0 (build $REVISION)";
59 # Default value of DIRCONFIG
60 -my $DIRCONFIG = "/etc/awstats";
61 +my $DIRCONFIG = "/etc/webapps/awstats";
66 # Check if AWSTATS prog is found
68 if (-s "$Awstats") { $AwstatsFound=1; }
69 - elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
70 - $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
71 + elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
72 + $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
75 if (! $AwstatsFound) {
76 diff -Nur b.awstats-6.6/wwwroot/cgi-bin/awstats.pl n.awstats-6.6/wwwroot/cgi-bin/awstats.pl
77 --- b.awstats-6.6/wwwroot/cgi-bin/awstats.pl 2007-01-16 13:14:33.000000000 +0100
78 +++ n.awstats-6.6/wwwroot/cgi-bin/awstats.pl 2007-01-16 13:15:15.000000000 +0100
80 @PossibleConfigDir=("$configdir");
83 - else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
84 + else { @PossibleConfigDir=("$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
87 $FileConfig=$FileSuffix='';
89 print " First, $PROG tries to read $PROG.virtualhostname.conf as the config file.\n";
90 print " If not found, $PROG tries to read $PROG.conf\n";
91 print " Note 1: Config files ($PROG.virtualhostname.conf or $PROG.conf) must be\n";
92 - print " in /etc/awstats, /usr/local/etc/awstats, /etc or same directory than\n";
93 - print " awstats.pl script file.\n";
94 + print " in /etc/webapps/awstasts, /etc/awstats, /usr/local/etc/awstats, /etc\n";
95 + print " or same directory than awstats.pl script file.\n";
96 print " Note 2: If AWSTATS_FORCE_CONFIG environment variable is defined, AWStats will\n";
97 print " use it as the \"config\" value, whatever is the value on command line or URL.\n";
98 print " See AWStats documentation for all setup instrutions.\n";