|
Lines 1-17
Link Here
|
| 1 |
--- tools/awstats_configure.pl.orig Sat Jan 15 17:42:58 2005 |
1 |
--- tools/awstats_configure.pl.old 2010-12-25 19:25:49.000000000 -0600 |
| 2 |
+++ tools/awstats_configure.pl Thu Sep 22 20:34:07 2005 |
2 |
+++ tools/awstats_configure.pl 2010-12-25 19:33:43.000000000 -0600 |
| 3 |
@@ -29,10 +29,10 @@ |
3 |
@@ -28,12 +28,13 @@ |
|
|
4 |
$AWSTATS_MODEL_CONFIG |
| 4 |
$AWSTATS_DIRDATA_PATH |
5 |
$AWSTATS_DIRDATA_PATH |
| 5 |
/; |
6 |
/; |
| 6 |
$AWSTATS_PATH=''; |
7 |
-$AWSTATS_PATH=''; |
| 7 |
-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; |
8 |
-$AWSTATS_ICON_PATH='/usr/local/awstats/wwwroot/icon'; |
| 8 |
-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; |
9 |
-$AWSTATS_CSS_PATH='/usr/local/awstats/wwwroot/css'; |
| 9 |
-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; |
10 |
-$AWSTATS_CLASSES_PATH='/usr/local/awstats/wwwroot/classes'; |
| 10 |
-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; |
11 |
-$AWSTATS_CGI_PATH='/usr/local/awstats/wwwroot/cgi-bin'; |
|
|
12 |
-$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux |
| 13 |
+$AWSTATS_PATH='%%PREFIX%%/www/awstats'; |
| 11 |
+$AWSTATS_ICON_PATH='%%PREFIX%%/www/awstats/icon'; |
14 |
+$AWSTATS_ICON_PATH='%%PREFIX%%/www/awstats/icon'; |
| 12 |
+$AWSTATS_CSS_PATH='%%PREFIX%%/www/awstats/css'; |
15 |
+$AWSTATS_CSS_PATH='%%PREFIX%%/www/awstats/css'; |
| 13 |
+$AWSTATS_CLASSES_PATH='%%PREFIX%%/www/awstats/classes'; |
16 |
+$AWSTATS_CLASSES_PATH='%%PREFIX%%/www/awstats/classes'; |
| 14 |
+$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/cgi-bin'; |
17 |
+$AWSTATS_CGI_PATH='%%PREFIX%%/www/awstats/cgi-bin'; |
| 15 |
$AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux |
18 |
+$AWSTATS_MODEL_CONFIG='%%PREFIX%%/etc/awstats/awstats.model.conf'; |
|
|
19 |
+# Used only when configure ran on linux |
| 16 |
$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux |
20 |
$AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux |
| 17 |
|
21 |
|
|
|
22 |
|
| 23 |
@@ -64,6 +65,7 @@ |
| 24 |
'/etc/httpd/httpd.conf', |
| 25 |
'/usr/local/apache/conf/httpd.conf', |
| 26 |
'/usr/local/apache2/conf/httpd.conf', |
| 27 |
+'/usr/local/etc/apache(13/22)/httpd.conf', |
| 28 |
); |
| 29 |
|
| 30 |
use vars qw/ |
| 31 |
@@ -309,7 +311,8 @@ |
| 32 |
$AWSTATS_PATH=`pwd`; $AWSTATS_PATH =~ s/[\r\n]//; |
| 33 |
$AWSTATS_PATH=~s/tools[\\\/]?$//; |
| 34 |
$AWSTATS_PATH=~s/[\\\/]$//; |
| 35 |
- if ($AWSTATS_PATH ne '/usr/local/awstats') { |
| 36 |
+#freebsd default %%PREFIX%%/www/awstats |
| 37 |
+ if ($AWSTATS_PATH ne '/usr/local/www/awstats') { |
| 38 |
print "Warning: AWStats standard directory on Linux OS is '/usr/local/awstats'.\n"; |
| 39 |
print "If you want to use standard directory, you should first move all content\n"; |
| 40 |
print "of AWStats distribution from current directory:\n"; |
| 41 |
@@ -324,10 +327,10 @@ |
| 42 |
print "configure.pl aborted.\n"; |
| 43 |
exit 1; |
| 44 |
} |
| 45 |
- $AWSTATS_ICON_PATH="$AWSTATS_PATH/wwwroot/icon"; |
| 46 |
- $AWSTATS_CSS_PATH="$AWSTATS_PATH/wwwroot/css"; |
| 47 |
- $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/wwwroot/classes"; |
| 48 |
- $AWSTATS_CGI_PATH="$AWSTATS_PATH/wwwroot/cgi-bin"; |
| 49 |
+ $AWSTATS_ICON_PATH="$AWSTATS_PATH/icon"; |
| 50 |
+ $AWSTATS_CSS_PATH="$AWSTATS_PATH/css"; |
| 51 |
+ $AWSTATS_CLASSES_PATH="$AWSTATS_PATH/classes"; |
| 52 |
+ $AWSTATS_CGI_PATH="$AWSTATS_PATH/cgi-bin"; |
| 53 |
} |
| 54 |
} |
| 55 |
elsif ($OS eq 'macosx') { |
| 56 |
@@ -420,6 +423,7 @@ |
| 57 |
|
| 58 |
print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n"; |
| 59 |
print "Example: /etc/httpd/httpd.conf\n"; |
| 60 |
+ print "Example: %%PREFIX%%/etc/apache(13/22)/httpd.conf"; |
| 61 |
print "Example: /usr/local/apache2/conf/httpd.conf\n"; |
| 62 |
print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n"; |
| 63 |
$bidon=''; |
| 64 |
@@ -527,7 +531,7 @@ |
| 65 |
# |
| 66 |
# This is to permit URL access to scripts/files in AWStats directory. |
| 67 |
# |
| 68 |
-<Directory "$AWSTATS_PATH/wwwroot"> |
| 69 |
+<Directory "$AWSTATS_PATH/"> |
| 70 |
Options None |
| 71 |
AllowOverride None |
| 72 |
Order allow,deny |
| 73 |
@@ -546,12 +550,12 @@ |
| 74 |
# ----------------------------- |
| 75 |
my $modelfile=''; |
| 76 |
if ($OS eq 'linux') { |
| 77 |
- if (-f "$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf") { |
| 78 |
- $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf"; |
| 79 |
+ if (-f "$AWSTATS_PATH/cgi-bin/awstats.model.conf") { |
| 80 |
+ $modelfile="$AWSTATS_PATH/cgi-bin/awstats.model.conf"; |
| 81 |
} |
| 82 |
else { |
| 83 |
$modelfile="$AWSTATS_MODEL_CONFIG"; |
| 84 |
- if (! -s $modelfile || ! -w $modelfile) { $modelfile="$AWSTATS_PATH/wwwroot/cgi-bin/awstats.model.conf"; } |
| 85 |
+ if (! -s $modelfile || ! -w $modelfile) { $modelfile="$AWSTATS_PATH/cgi-bin/awstats.model.conf"; } |
| 86 |
} |
| 87 |
} |
| 88 |
elsif ($OS eq "macosx") { |