[vhffs-dev] [500] Don't load vhffs API anymore ;)

[subversion@xxxxxxxxx]

Revision: 500
Author:   gradator
Date:     2007-02-28 23:16:11 +0000 (Wed, 28 Feb 2007)

Log Message:
-----------
Don't load vhffs API anymore ;)

Modified Paths:
--------------
    branches/vhffs_4.1/vhffs-robots/misc/awstats_6.4_vhffs.patch
    branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch
    trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch
    trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch


Modified: branches/vhffs_4.1/vhffs-robots/misc/awstats_6.4_vhffs.patch
===================================================================
--- branches/vhffs_4.1/vhffs-robots/misc/awstats_6.4_vhffs.patch	2007-02-28 16:41:02 UTC (rev 499)
+++ branches/vhffs_4.1/vhffs-robots/misc/awstats_6.4_vhffs.patch	2007-02-28 23:16:11 UTC (rev 500)
@@ -1,6 +1,6 @@
 --- /usr/lib/cgi-bin/awstats.pl	2006-05-26 09:38:54.000000000 +0200
-+++ awstats.pl	2007-01-21 10:24:18.000000000 +0100
-@@ -1091,10 +1091,18 @@
++++ awstats.pl	2007-03-01 00:05:51.000000000 +0100
+@@ -1091,10 +1091,10 @@
  	my $configdir=shift;
  	my @PossibleConfigDir=();
  
@@ -8,22 +8,14 @@
 -	    @PossibleConfigDir=("$configdir");
 -	}
 -	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+	use Vhffs::Main;
-+	use Vhffs::Conf;
-+	use Vhffs::Functions;
-+	my $vhffs = init Vhffs::Main;
-+	my $vhffsconfigdir = Vhffs::Conf::get_web_config()->{"log_parsed_root"}."/".Vhffs::Functions::hash_webdir( $SiteConfig )."/awstats";
-+
++	use Digest::MD5 qw(md5 md5_hex md5_base64);
++	my $vhffssitehash = md5_hex( $SiteConfig );
++	my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
 +	@PossibleConfigDir=("$vhffsconfigdir");
-+
-+#	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
-+#	    @PossibleConfigDir=("$configdir");
-+#	}
-+#	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
  
  	# Open config file
  	$FileConfig=$FileSuffix='';
-@@ -5740,7 +5748,7 @@
+@@ -5740,7 +5740,7 @@
  else { @DOWIndex = (0,1,2,3,4,5,6); }
  
  # Should we link to ourselves or to a wrapper script

Modified: branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch
===================================================================
--- branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-02-28 16:41:02 UTC (rev 499)
+++ branches/vhffs_4.1/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-02-28 23:16:11 UTC (rev 500)
@@ -1,27 +1,19 @@
---- /usr/lib/cgi-bin/awstats.pl	2007-01-08 23:55:32.000000000 +0100
-+++ awstats.pl	2007-01-22 22:06:59.000000000 +0100
-@@ -1131,8 +1131,18 @@
+--- /usr/lib/cgi-bin/awstats.pl	2006-11-04 22:17:24.000000000 +0100
++++ awstats.pl	2007-02-28 23:42:50.000000000 +0100
+@@ -1131,8 +1131,10 @@
  	my $configdir=shift;
  	my @PossibleConfigDir=();
  
 -	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); }
 -	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+       use Vhffs::Main;
-+       use Vhffs::Conf;
-+       use Vhffs::Functions;
-+       my $vhffs = init Vhffs::Main;
-+       my $vhffsconfigdir = Vhffs::Conf::get_web_config()->{"log_parsed_root"}."/".Vhffs::Functions::hash_webdir( $SiteConfig )."/awstats";
-+
-+       @PossibleConfigDir=("$vhffsconfigdir");
-+
-+#      if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
-+#          @PossibleConfigDir=("$configdir");
-+#      }
-+#      else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }	
++	use Digest::MD5 qw(md5 md5_hex md5_base64);
++	my $vhffssitehash = md5_hex( $SiteConfig );
++	my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
++	@PossibleConfigDir=("$vhffsconfigdir");
  
  	# Open config file
  	$FileConfig=$FileSuffix='';
-@@ -5878,7 +5888,7 @@
+@@ -5878,7 +5880,7 @@
  else { @DOWIndex = (0,1,2,3,4,5,6); }
  
  # Should we link to ourselves or to a wrapper script

Modified: trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch	2007-02-28 16:41:02 UTC (rev 499)
+++ trunk/vhffs-robots/misc/awstats_6.4_vhffs.patch	2007-02-28 23:16:11 UTC (rev 500)
@@ -1,6 +1,6 @@
 --- /usr/lib/cgi-bin/awstats.pl	2006-05-26 09:38:54.000000000 +0200
-+++ awstats.pl	2007-01-21 10:24:18.000000000 +0100
-@@ -1091,10 +1091,18 @@
++++ awstats.pl	2007-03-01 00:05:51.000000000 +0100
+@@ -1091,10 +1091,10 @@
  	my $configdir=shift;
  	my @PossibleConfigDir=();
  
@@ -8,22 +8,14 @@
 -	    @PossibleConfigDir=("$configdir");
 -	}
 -	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+	use Vhffs::Main;
-+	use Vhffs::Conf;
-+	use Vhffs::Functions;
-+	my $vhffs = init Vhffs::Main;
-+	my $vhffsconfigdir = Vhffs::Conf::get_web_config()->{"log_parsed_root"}."/".Vhffs::Functions::hash_webdir( $SiteConfig )."/awstats";
-+
++	use Digest::MD5 qw(md5 md5_hex md5_base64);
++	my $vhffssitehash = md5_hex( $SiteConfig );
++	my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
 +	@PossibleConfigDir=("$vhffsconfigdir");
-+
-+#	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
-+#	    @PossibleConfigDir=("$configdir");
-+#	}
-+#	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
  
  	# Open config file
  	$FileConfig=$FileSuffix='';
-@@ -5740,7 +5748,7 @@
+@@ -5740,7 +5740,7 @@
  else { @DOWIndex = (0,1,2,3,4,5,6); }
  
  # Should we link to ourselves or to a wrapper script

Modified: trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-02-28 16:41:02 UTC (rev 499)
+++ trunk/vhffs-robots/misc/awstats_6.5_vhffs.patch	2007-02-28 23:16:11 UTC (rev 500)
@@ -1,27 +1,19 @@
---- /usr/lib/cgi-bin/awstats.pl	2007-01-08 23:55:32.000000000 +0100
-+++ awstats.pl	2007-01-22 22:06:59.000000000 +0100
-@@ -1131,8 +1131,18 @@
+--- /usr/lib/cgi-bin/awstats.pl	2006-11-04 22:17:24.000000000 +0100
++++ awstats.pl	2007-02-28 23:42:50.000000000 +0100
+@@ -1131,8 +1131,10 @@
  	my $configdir=shift;
  	my @PossibleConfigDir=();
  
 -	if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) { @PossibleConfigDir=("$configdir"); }
 -	else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }
-+       use Vhffs::Main;
-+       use Vhffs::Conf;
-+       use Vhffs::Functions;
-+       my $vhffs = init Vhffs::Main;
-+       my $vhffsconfigdir = Vhffs::Conf::get_web_config()->{"log_parsed_root"}."/".Vhffs::Functions::hash_webdir( $SiteConfig )."/awstats";
-+
-+       @PossibleConfigDir=("$vhffsconfigdir");
-+
-+#      if ($configdir && $ENV{"AWSTATS_ENABLE_CONFIG_DIR"}) {
-+#          @PossibleConfigDir=("$configdir");
-+#      }
-+#      else { @PossibleConfigDir=("$DIR","/etc/awstats","/usr/local/etc/awstats","/etc","/etc/opt/awstats"); }	
++	use Digest::MD5 qw(md5 md5_hex md5_base64);
++	my $vhffssitehash = md5_hex( $SiteConfig );
++	my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
++	@PossibleConfigDir=("$vhffsconfigdir");
  
  	# Open config file
  	$FileConfig=$FileSuffix='';
-@@ -5878,7 +5888,7 @@
+@@ -5878,7 +5880,7 @@
  else { @DOWIndex = (0,1,2,3,4,5,6); }
  
  # Should we link to ourselves or to a wrapper script