[packages/awstats.git] / awstats-PLD.patch

diff -Naur awstats-6.5.orig/tools/awstats_buildstaticpages.pl awstats-6.5/tools/awstats_buildstaticpages.pl
--- awstats-6.5.orig/tools/awstats_buildstaticpages.pl	2005-03-20 19:11:05.000000000 +0100
+++ awstats-6.5/tools/awstats_buildstaticpages.pl	2006-02-26 16:03:40.162984464 +0100
@@ -133,7 +133,7 @@
 	my @PossibleConfigDir=();
 
 	if ($configdir) { @PossibleConfigDir=("$configdir"); }
-	else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
+	else { @PossibleConfigDir=("$AwstatsDir","$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
 
 	# Open config file
 	$FileConfig=$FileSuffix='';
@@ -293,8 +293,8 @@
 # Check if AWSTATS prog is found
 my $AwstatsFound=0;
 if (-s "$Awstats") { $AwstatsFound=1; }
-elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
-	$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
+elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
+	$Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
 	$AwstatsFound=1;
 }
 if (! $AwstatsFound) {
diff -Naur awstats-6.5.orig/tools/awstats_configure.pl awstats-6.5/tools/awstats_configure.pl
--- awstats-6.5.orig/tools/awstats_configure.pl	2005-03-27 16:50:22.000000000 +0200
+++ awstats-6.5/tools/awstats_configure.pl	2006-02-26 16:06:53.265628400 +0100
@@ -29,11 +29,11 @@
 $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_ICON_PATH='/usr/share/awstats/wwwroot/icon';
+$AWSTATS_CSS_PATH='/usr/share/awstats/wwwroot/css';
+$AWSTATS_CLASSES_PATH='/usr/share/awstats/wwwroot/classes';
+$AWSTATS_CGI_PATH='/usr/share/awstats/wwwroot/cgi-bin';
+$AWSTATS_MODEL_CONFIG='/etc/webapps/awstats/awstats.model.conf';		# Used only when configure ran on linux
 $AWSTATS_DIRDATA_PATH='/var/lib/awstats';						# Used only when configure ran on linux
 
 
@@ -604,11 +604,11 @@
 	if ($OS eq 'linux') 		{
 		print "\n-----> Define config file path\n";\r
 		print "In which directory do you plan to store your config file(s) ?\n";\r
-		print "Default: /etc/awstats\n";\r
+		print "Default: /etc/webapps/awstats\n";\r
 		my $bidon='';\r
 		print "Directory path to store config file(s) (Enter for default):\n> ";\r
 		$bidon=<STDIN>; chomp $bidon;\r
-		if (! $bidon) { $bidon = "/etc/awstats"; }
+		if (! $bidon) { $bidon = "/etc/webapps/awstats"; }
 		my $configdir=$bidon;\r
 		if (! -d $configdir) {
 			# Create the directory for config files
diff -Naur awstats-6.5.orig/tools/awstats_updateall.pl awstats-6.5/tools/awstats_updateall.pl
--- awstats-6.5.orig/tools/awstats_updateall.pl	2004-06-07 14:27:26.000000000 +0200
+++ awstats-6.5/tools/awstats_updateall.pl	2006-02-26 16:02:19.621228672 +0100
@@ -13,7 +13,7 @@
 my $VERSION="1.0 (build $REVISION)";
 
 # Default value of DIRCONFIG
-my $DIRCONFIG = "/etc/awstats";
+my $DIRCONFIG = "/etc/webapps/awstats";
 
 my $Debug=0;
 
@@ -121,8 +121,8 @@
 	# Check if AWSTATS prog is found
 	my $AwstatsFound=0;
 	if (-s "$Awstats") { $AwstatsFound=1; }
-	elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
-		$Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
+	elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
+		$Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
 		$AwstatsFound=1;
 	}
 	if (! $AwstatsFound) {
diff -Naur awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl awstats-6.5/wwwroot/cgi-bin/awstats.pl
--- awstats-6.5.orig/wwwroot/cgi-bin/awstats.pl	2006-02-26 15:57:27.391654000 +0100
+++ awstats-6.5/wwwroot/cgi-bin/awstats.pl	2006-02-26 16:00:29.892909912 +0100
@@ -1091,7 +1091,7 @@
 	my @PossibleConfigDir=();
 
 	if ($configdir) { @PossibleConfigDir=("$configdir"); }
-	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
+	else { @PossibleConfigDir=("$DIR","/etc/webapps/awstats","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
 
 	# Open config file
 	$FileConfig=$FileSuffix='';
@@ -5567,8 +5567,8 @@
 	print "  First, $PROG tries to read $PROG.virtualhostname.conf as the config file.\n";
 	print "  If not found, $PROG tries to read $PROG.conf\n";
 	print "  Note 1: Config files ($PROG.virtualhostname.conf or $PROG.conf) must be\n";
-	print "   in /etc/awstats, /usr/local/etc/awstats, /etc or same directory than\n";
-	print "   awstats.pl script file.\n";
+	print "   in /etc/webapps/awstasts, /etc/awstats, /usr/local/etc/awstats, /etc\n";
+	print "   or same directory than awstats.pl script file.\n";
 	print "  Note 2: If AWSTATS_FORCE_CONFIG environment variable is defined, AWStats will\n";
 	print "   use it as the \"config\" value, whatever is the value on command line or URL.\n";
 	print "   See AWStats documentation for all setup instrutions.\n";
Commit	Line	Data
765dcd59 MC	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
	4	@@ -133,7 +133,7 @@
	5	my @PossibleConfigDir=();
	6
	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"); }
	10
	11	# Open config file
	12	$FileConfig=$FileSuffix='';
	13	@@ -293,8 +293,8 @@
	14	# Check if AWSTATS prog is found
	15	my $AwstatsFound=0;
	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";
	21	$AwstatsFound=1;
	22	}
	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
	27	@@ -29,11 +29,11 @@
	28	$AWSTATS_DIRDATA_PATH
	29	/;
	30	$AWSTATS_PATH='';
	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
	42
	43
	44	@@ -604,11 +604,11 @@
	45	if ($OS eq '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
	50	my $bidon='';\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
	61	@@ -13,7 +13,7 @@
	62	my $VERSION="1.0 (build $REVISION)";
	63
	64	# Default value of DIRCONFIG
65	-my $DIRCONFIG = "/etc/awstats";
66	+my $DIRCONFIG = "/etc/webapps/awstats";
67
68	my $Debug=0;
69
70	@@ -121,8 +121,8 @@
71	# Check if AWSTATS prog is found
72	my $AwstatsFound=0;
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";
78	$AwstatsFound=1;
79	}
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
84	@@ -1091,7 +1091,7 @@
85	my @PossibleConfigDir=();
86
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"); }
90
91	# Open config file
92	$FileConfig=$FileSuffix='';
93	@@ -5567,8 +5567,8 @@
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";