| [vhffs-dev] [2270] Moved awstats patches from vhffs-robots/misc/ to vhffs-patches/ awstats/, moved awstats config examples from vhffs-robots/misc/ to vhffs-doc/config/awstats/ |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
- To: vhffs-dev@xxxxxxxxx
- Subject: [vhffs-dev] [2270] Moved awstats patches from vhffs-robots/misc/ to vhffs-patches/ awstats/, moved awstats config examples from vhffs-robots/misc/ to vhffs-doc/config/awstats/
- From: subversion@xxxxxxxxxxxxx
- Date: Wed, 11 Feb 2015 00:11:48 +0100
Revision: 2270
Author: gradator
Date: 2015-02-11 00:11:47 +0100 (Wed, 11 Feb 2015)
Log Message:
-----------
Moved awstats patches from vhffs-robots/misc/ to vhffs-patches/awstats/, moved awstats config examples from vhffs-robots/misc/ to vhffs-doc/config/awstats/
Modified Paths:
--------------
trunk/vhffs-doc/Makefile.am
trunk/vhffs-patches/Makefile.am
trunk/vhffs-robots/Makefile.am
Added Paths:
-----------
trunk/vhffs-doc/config/awstats/
trunk/vhffs-doc/config/awstats/awstats_htaccess_example
trunk/vhffs-doc/config/awstats/repository.awstats_htaccess_example
trunk/vhffs-patches/awstats/
trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch
trunk/vhffs-patches/awstats/awstats_7.0_vhffs.patch
trunk/vhffs-patches/awstats/awstats_7.1_vhffs.patch
trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch
trunk/vhffs-patches/awstats/repository.awstats_7.0_vhffs.patch
trunk/vhffs-patches/awstats/repository.awstats_7.1_vhffs.patch
Removed Paths:
-------------
trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch
trunk/vhffs-robots/misc/awstats_7.0_vhffs.patch
trunk/vhffs-robots/misc/awstats_7.1_vhffs.patch
trunk/vhffs-robots/misc/awstats_htaccess_example
trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch
trunk/vhffs-robots/misc/repository.awstats_7.0_vhffs.patch
trunk/vhffs-robots/misc/repository.awstats_7.1_vhffs.patch
trunk/vhffs-robots/misc/repository.awstats_htaccess_example
Modified: trunk/vhffs-doc/Makefile.am
===================================================================
--- trunk/vhffs-doc/Makefile.am 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-doc/Makefile.am 2015-02-10 23:11:47 UTC (rev 2270)
@@ -4,9 +4,13 @@
nobase_dist_doc_DATA = \
config/apache/panelconf \
+ config/apache/panelconf-fastcgi \
config/apache/publicconf \
+ config/apache/publicconf-fastcgi \
+ config/awstats/awstats_htaccess_example \
+ config/awstats/repository.awstats_htaccess_example \
+ config/bind/named.conf.vhffs \
config/bind/README \
- config/bind/named.conf.vhffs \
config/courier/authdaemonrc \
config/courier/authpgsqlrc \
config/courier/imapd \
@@ -22,4 +26,11 @@
config/exim4-mx1/exim4.conf \
config/exim4-mx2/00_vhffs \
config/exim4-mx2/exim4.conf \
- config/exim4-mx2/splitted-conf.patch
+ config/exim4-mx2/splitted-conf.patch \
+ src/dbdiag.dia \
+ src/fr/part1/applis.xml \
+ src/fr/part1/exim.xml \
+ src/fr/part1/mirror.xml \
+ src/fr/part1/mydns.xml \
+ src/fr/part1/services.xml \
+ src/fr/vhffs-doc.xml
Copied: trunk/vhffs-doc/config/awstats/awstats_htaccess_example (from rev 2269, trunk/vhffs-robots/misc/awstats_htaccess_example)
===================================================================
--- trunk/vhffs-doc/config/awstats/awstats_htaccess_example (rev 0)
+++ trunk/vhffs-doc/config/awstats/awstats_htaccess_example 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,4 @@
+RewriteEngine on
+RewriteRule ^([a-zA-Z0-9\.\-]+)/$ /awstats.pl?config=$1
+RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/$ /awstats.pl?config=$1&year=$2
+RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/([0-9]{2})/$ /awstats.pl?config=$1&year=$2&month=$3
Copied: trunk/vhffs-doc/config/awstats/repository.awstats_htaccess_example (from rev 2269, trunk/vhffs-robots/misc/repository.awstats_htaccess_example)
===================================================================
--- trunk/vhffs-doc/config/awstats/repository.awstats_htaccess_example (rev 0)
+++ trunk/vhffs-doc/config/awstats/repository.awstats_htaccess_example 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,4 @@
+RewriteEngine on
+RewriteRule ^([a-zA-Z0-9\.\-]+)/$ /awstats.pl?config=$1
+RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/$ /awstats.pl?config=$1&year=$2
+RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/([0-9]{2})/$ /awstats.pl?config=$1&year=$2&month=$3
Modified: trunk/vhffs-patches/Makefile.am
===================================================================
--- trunk/vhffs-patches/Makefile.am 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-patches/Makefile.am 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,4 +1,10 @@
EXTRA_DIST = \
+ awstats/awstats_6.95_vhffs.patch \
+ awstats/awstats_7.0_vhffs.patch \
+ awstats/awstats_7.1_vhffs.patch \
+ awstats/repository.awstats_6.95_vhffs.patch \
+ awstats/repository.awstats_7.0_vhffs.patch \
+ awstats/repository.awstats_7.1_vhffs.patch \
lighttpd/mod_partialcontentabuse.c \
lighttpd/README \
lighttpd/lighttpd-1.4.28-mod_partialcontentabuse.patch \
Copied: trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch (from rev 2269, trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch)
===================================================================
--- trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch (rev 0)
+++ trunk/vhffs-patches/awstats/awstats_6.95_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,46 @@
+--- awstats.pl_ 2012-04-30 18:52:22.668828732 +0200
++++ awstats.pl 2012-04-30 18:56:16.064121136 +0200
+@@ -1716,29 +1716,12 @@
+ # Other possible directories : "/usr/local/etc/awstats", "/etc"
+ # FHS standard, Suse package : "/etc/opt/awstats"
+ my $configdir = shift;
+- my @PossibleConfigDir = (
+- "$DIR",
+- "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+-
+- if ($configdir) {
+- # Check if configdir is outside default values.
+- my $outsidedefaultvalue=1;
+- foreach (@PossibleConfigDir) {
+- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+- }
+
+- # If from CGI, overwriting of configdir with a value that differs from a default value
+- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+- {
+- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+- }
+-
+- @PossibleConfigDir = ("$configdir");
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
++ 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';
++ my @PossibleConfigDir = ( $vhffsconfigdir );
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -10111,7 +10094,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+
+ # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
+ if ( !$HeaderHTMLSent ) { &html_head; }
Copied: trunk/vhffs-patches/awstats/awstats_7.0_vhffs.patch (from rev 2269, trunk/vhffs-robots/misc/awstats_7.0_vhffs.patch)
===================================================================
--- trunk/vhffs-patches/awstats/awstats_7.0_vhffs.patch (rev 0)
+++ trunk/vhffs-patches/awstats/awstats_7.0_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,46 @@
+--- awstats.pl 2011-04-17 01:03:15.000000000 +0200
++++ awstats.pl.web 2011-04-17 01:02:56.000000000 +0200
+@@ -1710,29 +1710,12 @@
+ # Other possible directories : "/usr/local/etc/awstats", "/etc"
+ # FHS standard, Suse package : "/etc/opt/awstats"
+ my $configdir = shift;
+- my @PossibleConfigDir = (
+- "$DIR",
+- "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+
+- if ($configdir) {
+- # Check if configdir is outside default values.
+- my $outsidedefaultvalue=1;
+- foreach (@PossibleConfigDir) {
+- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+- }
+-
+- # If from CGI, overwriting of configdir with a value that differs from a defautl value
+- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+- {
+- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+- }
+-
+- @PossibleConfigDir = ("$configdir");
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
++ use Digest::MD5;
++ my $vhffssitehash = Digest::MD5::md5_hex( $SiteConfig );
++ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
++ my @PossibleConfigDir=("$vhffsconfigdir");
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -16976,7 +16959,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+ if (index($AWScript,'?')>-1)
+ {
+ $AWScript .= '&'; # $AWScript contains URL parameters
Copied: trunk/vhffs-patches/awstats/awstats_7.1_vhffs.patch (from rev 2269, trunk/vhffs-robots/misc/awstats_7.1_vhffs.patch)
===================================================================
--- trunk/vhffs-patches/awstats/awstats_7.1_vhffs.patch (rev 0)
+++ trunk/vhffs-patches/awstats/awstats_7.1_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,46 @@
+--- awstats.pl.orig 2013-07-04 23:05:12.672725177 +0200
++++ awstats.pl 2013-07-04 23:06:42.623426836 +0200
+@@ -1706,29 +1706,12 @@
+ # Other possible directories : "/usr/local/etc/awstats", "/etc"
+ # FHS standard, Suse package : "/etc/opt/awstats"
+ my $configdir = shift;
+- my @PossibleConfigDir = (
+- "$DIR",
+- "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+
+- if ($configdir) {
+- # Check if configdir is outside default values.
+- my $outsidedefaultvalue=1;
+- foreach (@PossibleConfigDir) {
+- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+- }
+-
+- # If from CGI, overwriting of configdir with a value that differs from a defautl value
+- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+- {
+- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+- }
+-
+- @PossibleConfigDir = ("$configdir");
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
++ use Digest::MD5;
++ my $vhffssitehash = Digest::MD5::md5_hex( $SiteConfig );
++ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
++ my @PossibleConfigDir=("$vhffsconfigdir");
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -17363,7 +17346,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+ if (index($AWScript,'?')>-1)
+ {
+ $AWScript .= '&'; # $AWScript contains URL parameters
Copied: trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch (from rev 2269, trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch)
===================================================================
--- trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch (rev 0)
+++ trunk/vhffs-patches/awstats/repository.awstats_6.95_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,44 @@
+--- awstats.pl_ 2012-04-30 18:52:22.668828732 +0200
++++ awstats.pl 2012-04-30 18:58:32.599707630 +0200
+@@ -1716,29 +1716,10 @@
+ # Other possible directories : "/usr/local/etc/awstats", "/etc"
+ # FHS standard, Suse package : "/etc/opt/awstats"
+ my $configdir = shift;
+- my @PossibleConfigDir = (
+- "$DIR",
+- "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+-
+- if ($configdir) {
+- # Check if configdir is outside default values.
+- my $outsidedefaultvalue=1;
+- foreach (@PossibleConfigDir) {
+- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+- }
+
+- # If from CGI, overwriting of configdir with a value that differs from a default value
+- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+- {
+- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+- }
+-
+- @PossibleConfigDir = ("$configdir");
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
++ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
++ my @PossibleConfigDir = ($vhffsconfigdir );
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -10111,7 +10092,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+
+ # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
+ if ( !$HeaderHTMLSent ) { &html_head; }
Copied: trunk/vhffs-patches/awstats/repository.awstats_7.0_vhffs.patch (from rev 2269, trunk/vhffs-robots/misc/repository.awstats_7.0_vhffs.patch)
===================================================================
--- trunk/vhffs-patches/awstats/repository.awstats_7.0_vhffs.patch (rev 0)
+++ trunk/vhffs-patches/awstats/repository.awstats_7.0_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,44 @@
+--- awstats.pl 2011-04-17 01:03:15.000000000 +0200
++++ awstats.pl.repo 2011-04-17 01:04:42.000000000 +0200
+@@ -1710,29 +1710,10 @@
+ # Other possible directories : "/usr/local/etc/awstats", "/etc"
+ # FHS standard, Suse package : "/etc/opt/awstats"
+ my $configdir = shift;
+- my @PossibleConfigDir = (
+- "$DIR",
+- "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+
+- if ($configdir) {
+- # Check if configdir is outside default values.
+- my $outsidedefaultvalue=1;
+- foreach (@PossibleConfigDir) {
+- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+- }
+-
+- # If from CGI, overwriting of configdir with a value that differs from a defautl value
+- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+- {
+- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+- }
+-
+- @PossibleConfigDir = ("$configdir");
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
++ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
++ my @PossibleConfigDir=("$vhffsconfigdir");
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -16976,7 +16957,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+ if (index($AWScript,'?')>-1)
+ {
+ $AWScript .= '&'; # $AWScript contains URL parameters
Copied: trunk/vhffs-patches/awstats/repository.awstats_7.1_vhffs.patch (from rev 2269, trunk/vhffs-robots/misc/repository.awstats_7.1_vhffs.patch)
===================================================================
--- trunk/vhffs-patches/awstats/repository.awstats_7.1_vhffs.patch (rev 0)
+++ trunk/vhffs-patches/awstats/repository.awstats_7.1_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -0,0 +1,44 @@
+--- awstats.pl.orig 2013-07-04 23:07:34.402662237 +0200
++++ awstats.pl 2013-07-04 23:07:41.530556705 +0200
+@@ -1706,29 +1706,10 @@
+ # Other possible directories : "/usr/local/etc/awstats", "/etc"
+ # FHS standard, Suse package : "/etc/opt/awstats"
+ my $configdir = shift;
+- my @PossibleConfigDir = (
+- "$DIR",
+- "/etc/awstats",
+- "/usr/local/etc/awstats", "/etc",
+- "/etc/opt/awstats"
+- );
+
+- if ($configdir) {
+- # Check if configdir is outside default values.
+- my $outsidedefaultvalue=1;
+- foreach (@PossibleConfigDir) {
+- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
+- }
+-
+- # If from CGI, overwriting of configdir with a value that differs from a defautl value
+- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
+- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
+- {
+- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
+- }
+-
+- @PossibleConfigDir = ("$configdir");
+- }
++ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
++ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
++ my @PossibleConfigDir=("$vhffsconfigdir");
+
+ # Open config file
+ $FileConfig = $FileSuffix = '';
+@@ -17363,7 +17344,7 @@
+ else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
+
+ # Should we link to ourselves or to a wrapper script
+-$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
++$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
+ if (index($AWScript,'?')>-1)
+ {
+ $AWScript .= '&'; # $AWScript contains URL parameters
Modified: trunk/vhffs-robots/Makefile.am
===================================================================
--- trunk/vhffs-robots/Makefile.am 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/Makefile.am 2015-02-10 23:11:47 UTC (rev 2270)
@@ -2,14 +2,8 @@
botsdir = @BOTSDIR@
nobase_dist_bots_DATA = \
- misc/awstats_6.95_vhffs.patch \
- misc/awstats_7.0_vhffs.patch \
- misc/awstats_htaccess_example \
misc/awstats.sample \
misc/disabled_webarea.htaccess \
- misc/repository.awstats_6.95_vhffs.patch \
- misc/repository.awstats_7.0_vhffs.patch \
- misc/repository.awstats_htaccess_example \
misc/repository.awstats.sample \
misc/cvs_viewvc.conf.tt \
misc/svn_viewvc.conf.tt \
Deleted: trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/awstats_6.95_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,46 +0,0 @@
---- awstats.pl_ 2012-04-30 18:52:22.668828732 +0200
-+++ awstats.pl 2012-04-30 18:56:16.064121136 +0200
-@@ -1716,29 +1716,12 @@
- # Other possible directories : "/usr/local/etc/awstats", "/etc"
- # FHS standard, Suse package : "/etc/opt/awstats"
- my $configdir = shift;
-- my @PossibleConfigDir = (
-- "$DIR",
-- "/etc/awstats",
-- "/usr/local/etc/awstats", "/etc",
-- "/etc/opt/awstats"
-- );
--
-- if ($configdir) {
-- # Check if configdir is outside default values.
-- my $outsidedefaultvalue=1;
-- foreach (@PossibleConfigDir) {
-- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
-- }
-
-- # If from CGI, overwriting of configdir with a value that differs from a default value
-- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
-- }
--
-- @PossibleConfigDir = ("$configdir");
-- }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
-+ 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';
-+ my @PossibleConfigDir = ( $vhffsconfigdir );
-
- # Open config file
- $FileConfig = $FileSuffix = '';
-@@ -10111,7 +10094,7 @@
- else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
-+$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if ( !$HeaderHTMLSent ) { &html_head; }
Deleted: trunk/vhffs-robots/misc/awstats_7.0_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_7.0_vhffs.patch 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/awstats_7.0_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,46 +0,0 @@
---- awstats.pl 2011-04-17 01:03:15.000000000 +0200
-+++ awstats.pl.web 2011-04-17 01:02:56.000000000 +0200
-@@ -1710,29 +1710,12 @@
- # Other possible directories : "/usr/local/etc/awstats", "/etc"
- # FHS standard, Suse package : "/etc/opt/awstats"
- my $configdir = shift;
-- my @PossibleConfigDir = (
-- "$DIR",
-- "/etc/awstats",
-- "/usr/local/etc/awstats", "/etc",
-- "/etc/opt/awstats"
-- );
-
-- if ($configdir) {
-- # Check if configdir is outside default values.
-- my $outsidedefaultvalue=1;
-- foreach (@PossibleConfigDir) {
-- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
-- }
--
-- # If from CGI, overwriting of configdir with a value that differs from a defautl value
-- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
-- }
--
-- @PossibleConfigDir = ("$configdir");
-- }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
-+ use Digest::MD5;
-+ my $vhffssitehash = Digest::MD5::md5_hex( $SiteConfig );
-+ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
-+ my @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig = $FileSuffix = '';
-@@ -16976,7 +16959,7 @@
- else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
-+$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
- if (index($AWScript,'?')>-1)
- {
- $AWScript .= '&'; # $AWScript contains URL parameters
Deleted: trunk/vhffs-robots/misc/awstats_7.1_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/awstats_7.1_vhffs.patch 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/awstats_7.1_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,46 +0,0 @@
---- awstats.pl.orig 2013-07-04 23:05:12.672725177 +0200
-+++ awstats.pl 2013-07-04 23:06:42.623426836 +0200
-@@ -1706,29 +1706,12 @@
- # Other possible directories : "/usr/local/etc/awstats", "/etc"
- # FHS standard, Suse package : "/etc/opt/awstats"
- my $configdir = shift;
-- my @PossibleConfigDir = (
-- "$DIR",
-- "/etc/awstats",
-- "/usr/local/etc/awstats", "/etc",
-- "/etc/opt/awstats"
-- );
-
-- if ($configdir) {
-- # Check if configdir is outside default values.
-- my $outsidedefaultvalue=1;
-- foreach (@PossibleConfigDir) {
-- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
-- }
--
-- # If from CGI, overwriting of configdir with a value that differs from a defautl value
-- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
-- }
--
-- @PossibleConfigDir = ("$configdir");
-- }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z\.\-]+$/ );
-+ use Digest::MD5;
-+ my $vhffssitehash = Digest::MD5::md5_hex( $SiteConfig );
-+ my $vhffsconfigdir = '/data/web/'.substr( $vhffssitehash, 0, 2 ).'/'.substr( $vhffssitehash, 2, 2 ).'/'.substr( $vhffssitehash, 4, 2 ).'/'.$SiteConfig.'/awstats';
-+ my @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig = $FileSuffix = '';
-@@ -17363,7 +17346,7 @@
- else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
-+$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
- if (index($AWScript,'?')>-1)
- {
- $AWScript .= '&'; # $AWScript contains URL parameters
Deleted: trunk/vhffs-robots/misc/awstats_htaccess_example
===================================================================
--- trunk/vhffs-robots/misc/awstats_htaccess_example 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/awstats_htaccess_example 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,4 +0,0 @@
-RewriteEngine on
-RewriteRule ^([a-zA-Z0-9\.\-]+)/$ /awstats.pl?config=$1
-RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/$ /awstats.pl?config=$1&year=$2
-RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/([0-9]{2})/$ /awstats.pl?config=$1&year=$2&month=$3
Deleted: trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/repository.awstats_6.95_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,44 +0,0 @@
---- awstats.pl_ 2012-04-30 18:52:22.668828732 +0200
-+++ awstats.pl 2012-04-30 18:58:32.599707630 +0200
-@@ -1716,29 +1716,10 @@
- # Other possible directories : "/usr/local/etc/awstats", "/etc"
- # FHS standard, Suse package : "/etc/opt/awstats"
- my $configdir = shift;
-- my @PossibleConfigDir = (
-- "$DIR",
-- "/etc/awstats",
-- "/usr/local/etc/awstats", "/etc",
-- "/etc/opt/awstats"
-- );
--
-- if ($configdir) {
-- # Check if configdir is outside default values.
-- my $outsidedefaultvalue=1;
-- foreach (@PossibleConfigDir) {
-- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
-- }
-
-- # If from CGI, overwriting of configdir with a value that differs from a default value
-- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
-- }
--
-- @PossibleConfigDir = ("$configdir");
-- }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
-+ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
-+ my @PossibleConfigDir = ($vhffsconfigdir );
-
- # Open config file
- $FileConfig = $FileSuffix = '';
-@@ -10111,7 +10092,7 @@
- else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
-+$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
-
- # Print html header (Need HTMLOutput,Expires,Lang,StyleSheet,HTMLHeadSectionExpires defined by Read_Config, PageCode defined by Read_Language_Data)
- if ( !$HeaderHTMLSent ) { &html_head; }
Deleted: trunk/vhffs-robots/misc/repository.awstats_7.0_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_7.0_vhffs.patch 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/repository.awstats_7.0_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,44 +0,0 @@
---- awstats.pl 2011-04-17 01:03:15.000000000 +0200
-+++ awstats.pl.repo 2011-04-17 01:04:42.000000000 +0200
-@@ -1710,29 +1710,10 @@
- # Other possible directories : "/usr/local/etc/awstats", "/etc"
- # FHS standard, Suse package : "/etc/opt/awstats"
- my $configdir = shift;
-- my @PossibleConfigDir = (
-- "$DIR",
-- "/etc/awstats",
-- "/usr/local/etc/awstats", "/etc",
-- "/etc/opt/awstats"
-- );
-
-- if ($configdir) {
-- # Check if configdir is outside default values.
-- my $outsidedefaultvalue=1;
-- foreach (@PossibleConfigDir) {
-- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
-- }
--
-- # If from CGI, overwriting of configdir with a value that differs from a defautl value
-- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
-- }
--
-- @PossibleConfigDir = ("$configdir");
-- }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
-+ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
-+ my @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig = $FileSuffix = '';
-@@ -16976,7 +16957,7 @@
- else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
-+$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
- if (index($AWScript,'?')>-1)
- {
- $AWScript .= '&'; # $AWScript contains URL parameters
Deleted: trunk/vhffs-robots/misc/repository.awstats_7.1_vhffs.patch
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_7.1_vhffs.patch 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/repository.awstats_7.1_vhffs.patch 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,44 +0,0 @@
---- awstats.pl.orig 2013-07-04 23:07:34.402662237 +0200
-+++ awstats.pl 2013-07-04 23:07:41.530556705 +0200
-@@ -1706,29 +1706,10 @@
- # Other possible directories : "/usr/local/etc/awstats", "/etc"
- # FHS standard, Suse package : "/etc/opt/awstats"
- my $configdir = shift;
-- my @PossibleConfigDir = (
-- "$DIR",
-- "/etc/awstats",
-- "/usr/local/etc/awstats", "/etc",
-- "/etc/opt/awstats"
-- );
-
-- if ($configdir) {
-- # Check if configdir is outside default values.
-- my $outsidedefaultvalue=1;
-- foreach (@PossibleConfigDir) {
-- if ($_ eq $configdir) { $outsidedefaultvalue=0; last; }
-- }
--
-- # If from CGI, overwriting of configdir with a value that differs from a defautl value
-- # is only possible if AWSTATS_ENABLE_CONFIG_DIR defined
-- if ($ENV{'GATEWAY_INTERFACE'} && $outsidedefaultvalue && ! $ENV{"AWSTATS_ENABLE_CONFIG_DIR"})
-- {
-- error("Sorry, to allow overwriting of configdir parameter, from an AWStats CGI page, with a non default value, environment variable AWSTATS_ENABLE_CONFIG_DIR must be set to 1. For example, by adding the line 'SetEnv AWSTATS_ENABLE_CONFIG_DIR 1' in your Apache config file or into a .htaccess file.");
-- }
--
-- @PossibleConfigDir = ("$configdir");
-- }
-+ error("Wrong config name") unless( $SiteConfig =~ /^[0-9a-z]+$/ );
-+ my $vhffsconfigdir = '/data/logs/repository/parsed/'.$SiteConfig.'/awstats';
-+ my @PossibleConfigDir=("$vhffsconfigdir");
-
- # Open config file
- $FileConfig = $FileSuffix = '';
-@@ -17363,7 +17344,7 @@
- else { @DOWIndex = ( 0, 1, 2, 3, 4, 5, 6 ); }
-
- # Should we link to ourselves or to a wrapper script
--$AWScript = ( $WrapperScript ? "$WrapperScript" : "$DirCgi$PROG.$Extension" );
-+$AWScript = ( $WrapperScript ? "$WrapperScript" : "/$DirCgi$PROG.$Extension" );
- if (index($AWScript,'?')>-1)
- {
- $AWScript .= '&'; # $AWScript contains URL parameters
Deleted: trunk/vhffs-robots/misc/repository.awstats_htaccess_example
===================================================================
--- trunk/vhffs-robots/misc/repository.awstats_htaccess_example 2015-02-07 23:28:31 UTC (rev 2269)
+++ trunk/vhffs-robots/misc/repository.awstats_htaccess_example 2015-02-10 23:11:47 UTC (rev 2270)
@@ -1,4 +0,0 @@
-RewriteEngine on
-RewriteRule ^([a-zA-Z0-9\.\-]+)/$ /awstats.pl?config=$1
-RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/$ /awstats.pl?config=$1&year=$2
-RewriteRule ^([a-zA-Z0-9\.\-]+)/([0-9]{4})/([0-9]{2})/$ /awstats.pl?config=$1&year=$2&month=$3