018949743d
* With postfix that support DSN (Delivery Status Notifications) we exclude
some lines to avoid counting mails twice in maillogconvert.pl script.
* Logresolvemerge.pl support FreeRADIUS logs or anything else using
(the fixed length!) ctime format timestamp.
* Add option stoponfirsteof in logresolvemerge tool.
* Add patch to support host_proxy tag in LogFormat (for Apache LogFormat
containing %{X-Forwarded-For}i)
* Renamed Add to favourites on "Hit on favicon".
* Increase robots, search engines database (Added Google Chrome browser,
better Vista, WII, detection, ...)
* Update languages files.
* Added a lot of patch from sourceforge.
* Bug fixes.
136 lines
5.7 KiB
Text
136 lines
5.7 KiB
Text
$NetBSD: patch-ab,v 1.6 2009/01/15 12:12:04 adam Exp $
|
|
|
|
--- tools/awstats_configure.pl.orig 2008-04-06 15:45:24.000000000 +0200
|
|
+++ tools/awstats_configure.pl
|
|
@@ -29,12 +29,12 @@ $AWSTATS_MODEL_CONFIG
|
|
$AWSTATS_DIRDATA_PATH
|
|
/;
|
|
$AWSTATS_PATH='';
|
|
-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon';
|
|
-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css';
|
|
-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes';
|
|
-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin';
|
|
-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux
|
|
-$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux
|
|
+$AWSTATS_ICON_PATH='@PREFIX@/awstats/icon';
|
|
+$AWSTATS_CSS_PATH='@PREFIX@/awstats/css';
|
|
+$AWSTATS_CLASSES_PATH='@PREFIX@/awstats/classes';
|
|
+$AWSTATS_CGI_PATH='@PREFIX@/awstats/cgi-bin';
|
|
+$AWSTATS_MODEL_CONFIG='@PKG_SYSCONFDIR@/awstats.model.conf'; # Used only when configure ran on linux
|
|
+$AWSTATS_DIRDATA_PATH='@VARBASE@/awstats'; # Used only when configure ran on linux
|
|
|
|
|
|
|
|
@@ -64,6 +64,7 @@ use vars qw/
|
|
'/etc/httpd/httpd.conf',
|
|
'/usr/local/apache/conf/httpd.conf',
|
|
'/usr/local/apache2/conf/httpd.conf',
|
|
+'@PREFIX@/etc/httpd/httpd.conf',
|
|
);
|
|
|
|
use vars qw/
|
|
@@ -309,13 +310,13 @@ if ($OS eq 'linux') {
|
|
$AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//;
|
|
$AWSTATS_PATH=~s/tools[\\\/]?$//;
|
|
$AWSTATS_PATH=~s/[\\\/]$//;
|
|
- if ($AWSTATS_PATH ne '/usr/local/awstats') {
|
|
- print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n";
|
|
+ if ($AWSTATS_PATH ne '@PREFIX@/awstats') {
|
|
+ print "Warning: AWStats standard directory on Linux OS is '@PREFIX@/awstats'.\n";
|
|
print "If you want to use standard directory, you should first move all content\n";
|
|
print "of AWStats distribution from current directory:\n";
|
|
print "$AWSTATS_PATH\n";
|
|
print "to standard directory:\n";
|
|
- print "/usr/local/awstats\n";
|
|
+ print "@PREFIX@/awstats\n";
|
|
print "And then, run configure.pl from this location.\n";
|
|
print "Do you want to continue setup from this NON standard directory [yN] ? ";
|
|
my $bidon='';
|
|
@@ -324,23 +325,23 @@ if ($OS eq 'linux') {
|
|
print "configure.pl aborted.\n";
|
|
exit 1;
|
|
}
|
|
- $AWSTATS_ICON_PATH="$AWSTATS_PATH/wwwroot/icon";
|
|
- $AWSTATS_CSS_PATH="$AWSTATS_PATH/wwwroot/css";
|
|
- $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/wwwroot/classes";
|
|
- $AWSTATS_CGI_PATH="$AWSTATS_PATH/wwwroot/cgi-bin";
|
|
+ $AWSTATS_ICON_PATH="$AWSTATS_PATH/icon";
|
|
+ $AWSTATS_CSS_PATH="$AWSTATS_PATH/css";
|
|
+ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes";
|
|
+ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin";
|
|
}
|
|
}
|
|
elsif ($OS eq 'macosx') {
|
|
$AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//;
|
|
$AWSTATS_PATH=~s/tools[\\\/]?$//;
|
|
$AWSTATS_PATH=~s/[\\\/]$//;
|
|
- if ($AWSTATS_PATH ne '/Library/WebServer/awstats') {
|
|
- print "Warning: AWStats standard directory on Mac OS X is '/Library/WebServer/awstats'.\n";
|
|
+ if ($AWSTATS_PATH ne '@PREFIX@/awstats') {
|
|
+ print "Warning: AWStats standard directory on Mac OS X is '@PREFIX@/awstats'.\n";
|
|
print "If you want to use standard directory, you should first move all content\n";
|
|
print "of AWStats distribution from current directory:\n";
|
|
print "$AWSTATS_PATH\n";
|
|
print "to standard directory:\n";
|
|
- print "/Library/WebServer/awstats\n";
|
|
+ print "@PREFIX@/awstats\n";
|
|
print "And then, run configure.pl from this location.\n";
|
|
print "Do you want to continue setup from this NON standard directory [yN] ? ";
|
|
my $bidon='';
|
|
@@ -349,10 +350,10 @@ elsif ($OS eq 'macosx') {
|
|
print "configure.pl aborted.\n";
|
|
exit 1;
|
|
}
|
|
- $AWSTATS_ICON_PATH="$AWSTATS_PATH/wwwroot/icon";
|
|
- $AWSTATS_CSS_PATH="$AWSTATS_PATH/wwwroot/css";
|
|
- $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/wwwroot/classes";
|
|
- $AWSTATS_CGI_PATH="$AWSTATS_PATH/wwwroot/cgi-bin";
|
|
+ $AWSTATS_ICON_PATH="$AWSTATS_PATH/icon";
|
|
+ $AWSTATS_CSS_PATH="$AWSTATS_PATH/css";
|
|
+ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes";
|
|
+ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin";
|
|
}
|
|
}
|
|
elsif ($OS eq 'windows') {
|
|
@@ -421,6 +422,7 @@ if (! scalar keys %ApacheConfPath) {
|
|
print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
|
|
print "Example: /etc/httpd/httpd.conf\n";
|
|
print "Example: /usr/local/apache2/conf/httpd.conf\n";
|
|
+ print "Example: @PREFIX@/etc/httpd/httpd.conf\n";
|
|
print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
|
|
$bidon='';
|
|
while ($bidon ne 'none' && ! -f "$bidon") {
|
|
@@ -546,8 +548,8 @@ EOF
|
|
# -----------------------------
|
|
my $modelfile='';
|
|
if ($OS eq 'linux') {
|
|
- if (-f "$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf") {
|
|
- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
|
|
+ if (-f "@PKG_SYSCONFDIR@/awstats.model.conf") {
|
|
+ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf";
|
|
}
|
|
else {
|
|
$modelfile="$AWSTATS_MODEL_CONFIG";
|
|
@@ -555,7 +557,7 @@ if ($OS eq 'linux') {
|
|
}
|
|
}
|
|
elsif ($OS eq "macosx") {
|
|
- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf";
|
|
+ $modelfile="@PKG_SYSCONFDIR@/awstats.model.conf";
|
|
}
|
|
elsif ($OS eq 'windows') { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; }
|
|
else { $modelfile="$AWSTATS_PATH\\wwwroot\\cgi-bin\\awstats.model.conf"; }
|
|
@@ -608,11 +610,11 @@ if ($bidon =~ /^y/i) {
|
|
if ($OS eq 'linux') {
|
|
print "\n-----> Define config file path\n";
|
|
print "In which directory do you plan to store your config file(s) ?\n";
|
|
- print "Default: /etc/awstats\n";
|
|
+ print "Default: @PKG_SYSCONFDIR@\n";
|
|
my $bidon='';
|
|
print "Directory path to store config file(s) (Enter for default):\n> ";
|
|
$bidon=<STDIN>; chomp $bidon;
|
|
- if (! $bidon) { $bidon = "/etc/awstats"; }
|
|
+ if (! $bidon) { $bidon = "@PKG_SYSCONFDIR@"; }
|
|
my $configdir=$bidon;
|
|
if (! -d $configdir) {
|
|
# Create the directory for config files
|