1 diff -Naur awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/awstats_buildstaticpages.pl
2 --- awstats-6.5.orig/tools/awstats_buildstaticpages.pl 2005-03-20 19:11:05.000000000 +0100
3 +++ awstats-6.5/tools/awstats_buildstaticpages.pl 2006-02-26 16:03:40.162984464 +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 -Naur awstats-6.5.orig/tools/awstats_configure.pl awstats-6.5/tools/awstats_configure.pl
25 --- awstats-6.5.orig/tools/awstats_configure.pl 2005-03-27 16:50:22.000000000 +0200
26 +++ awstats-6.5/tools/awstats_configure.pl 2006-02-26 16:06:53.265628400 +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 "\n-----> Define config file path\n";
\r
47 print "In which directory do you plan to store your config file(s) ?\n";
\r
48 - print "Default: /etc/awstats\n";
\r
49 + print "Default: /etc/webapps/awstats\n";
\r
51 print "Directory path to store config file(s) (Enter for default):\n> ";
\r
52 $bidon=<STDIN>; chomp $bidon;
\r
53 - if (! $bidon) { $bidon = "/etc/awstats"; }
54 + if (! $bidon) { $bidon = "/etc/webapps/awstats"; }
55 my $configdir=$bidon;
\r
56 if (! -d $configdir) {
57 # Create the directory for config files
58 diff -Naur awstats-6.5.orig/tools/awstats_updateall.pl awstats-6.5/tools/awstats_updateall.pl
59 --- awstats-6.5.orig/tools/awstats_updateall.pl 2004-06-07 14:27:26.000000000 +0200
60 +++ awstats-6.5/tools/awstats_updateall.pl 2006-02-26 16:02:19.621228672 +0100
62 my $VERSION="1.0 (build $REVISION)";
64 # Default value of DIRCONFIG
65 -my $DIRCONFIG = "/etc/awstats";
66 +my $DIRCONFIG = "/etc/webapps/awstats";
71 # Check if AWSTATS prog is found
73 if (-s "$Awstats") { $AwstatsFound=1; }
74 - elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
75 - $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
76 + elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
77 + $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
80 if (! $AwstatsFound) {
81 diff -Naur awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl awstats-6.5/wwwroot/cgi-bin/awstats.pl
82 --- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl 2006-02-26 15:57:27.391654000 +0100
83 +++ awstats-6.5/wwwroot/cgi-bin/awstats.pl 2006-02-26 16:00:29.892909912 +0100
85 my @PossibleConfigDir=();
87 if ($configdir) { @PossibleConfigDir=("$configdir"); }
88 - else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
89 + else { @PossibleConfigDir=("$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
92 $FileConfig=$FileSuffix='';
94 print " First, $PROG tries to read $PROG.virtualhostname.conf as the config file.\n";
95 print " If not found, $PROG tries to read $PROG.conf\n";
96 print " Note 1: Config files ($PROG.virtualhostname.conf or $PROG.conf) must be\n";
97 - print " in /etc/awstats, /usr/local/etc/awstats, /etc or same directory than\n";
98 - print " awstats.pl script file.\n";
99 + print " in /etc/webapps/awstasts, /etc/awstats, /usr/local/etc/awstats, /etc\n";
100 + print " or same directory than awstats.pl script file.\n";
101 print " Note 2: If AWSTATS_FORCE_CONFIG environment variable is defined, AWStats will\n";
102 print " use it as the \"config\" value, whatever is the value on command line or URL.\n";
103 print " See AWStats documentation for all setup instrutions.\n";