awstats-PLD.patch

   1 diff -Nur b.awstats-6.6/tools/awstats_buildstaticpages.pl n.awstats-6.6/tools/awstats_buildstaticpages.pl
   2 --- b.awstats-6.6/tools/awstats_buildstaticpages.pl     2006-02-08 23:26:14.000000000 +0100
   3 +++ n.awstats-6.6/tools/awstats_buildstaticpages.pl     2007-01-16 13:15:15.000000000 +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 -Nur b.awstats-6.6/tools/awstats_configure.pl n.awstats-6.6/tools/awstats_configure.pl
  25 --- b.awstats-6.6/tools/awstats_configure.pl    2006-02-08 23:26:14.000000000 +0100
  26 +++ n.awstats-6.6/tools/awstats_configure.pl    2007-01-16 13:15:15.000000000 +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 @@ -608,7 +608,7 @@
  45                 my $bidon='';
  46                 print "Directory path to store config file(s) (Enter for default):\n> ";
  47                 $bidon=<STDIN>; chomp $bidon;
  48 -               if (! $bidon) { $bidon = "/etc/awstats"; }
  49 +               if (! $bidon) { $bidon = "/etc/webapps/awstats"; }
  50                 my $configdir=$bidon;
  51                 if (! -d $configdir) {
  52                         # Create the directory for config files
  53 diff -Nur b.awstats-6.6/tools/awstats_updateall.pl n.awstats-6.6/tools/awstats_updateall.pl
  54 --- b.awstats-6.6/tools/awstats_updateall.pl    2006-07-24 01:57:48.000000000 +0200
  55 +++ n.awstats-6.6/tools/awstats_updateall.pl    2007-01-16 13:15:15.000000000 +0100
  56 @@ -13,7 +13,7 @@
  57  my $VERSION="1.0 (build $REVISION)";
  58
  59  # Default value of DIRCONFIG
  60 -my $DIRCONFIG = "/etc/awstats";
  61 +my $DIRCONFIG = "/etc/webapps/awstats";
  62
  63  my $Debug=0;
  64
  65 @@ -130,8 +130,8 @@
  66         # Check if AWSTATS prog is found
  67         my $AwstatsFound=0;
  68         if (-s "$Awstats") { $AwstatsFound=1; }
  69 -       elsif (-s "/usr/local/awstats/wwwroot/cgi-bin/awstats.pl") {
  70 -               $Awstats="/usr/local/awstats/wwwroot/cgi-bin/awstats.pl";
  71 +       elsif (-s "/usr/share/awstats/wwwroot/cgi-bin/awstats.pl") {
  72 +               $Awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl";
  73                 $AwstatsFound=1;
  74         }
  75         if (! $AwstatsFound) {
  76 --- awstats-6.9/wwwroot/cgi-bin/awstats.pl.fix  2009-03-20 13:48:27.572771826 +0100
  77 +++ awstats-6.9/wwwroot/cgi-bin/awstats.pl      2009-03-20 13:49:16.911789620 +0100
  78 @@ -1642,7 +1642,7 @@ sub Read_Config {
  79         }
  80         else {
  81                 @PossibleConfigDir = (
  82 -                                                          "$DIR",                   "/etc/awstats",
  83 +                                                          "$DIR", "/etc/webapps/awstats", "/etc/awstats",
  84                                                            "/usr/local/etc/awstats", "/etc",
  85                                                            "/etc/opt/awstats"
  86                 );