From e3fda8322ec4c98a0f64ffdd6d8f2f6824247236 Mon Sep 17 00:00:00 2001 From: Nishant Limbachia Date: Sun, 2 Mar 2014 10:12:01 +0700 Subject: network/awstats: Updated for version 7.3. Signed-off-by: Willy Sudiarto Raharjo --- network/awstats/patches/awstats_configure.pl.patch | 26 ++++++++++++---------- network/awstats/patches/httpd-awstats.conf.patch | 8 +++---- 2 files changed, 18 insertions(+), 16 deletions(-) (limited to 'network/awstats/patches') diff --git a/network/awstats/patches/awstats_configure.pl.patch b/network/awstats/patches/awstats_configure.pl.patch index 3f8995ca5adc4..67871229acb8f 100644 --- a/network/awstats/patches/awstats_configure.pl.patch +++ b/network/awstats/patches/awstats_configure.pl.patch @@ -1,6 +1,6 @@ ---- tools/awstats_configure.pl.orig 2013-11-06 23:39:01.487947740 -0600 -+++ tools/awstats_configure.pl 2013-11-07 07:17:47.975586091 -0600 -@@ -28,11 +28,11 @@ +--- tools/awstats_configure.pl.orig 2014-01-29 09:06:10.000000000 -0600 ++++ tools/awstats_configure.pl 2014-03-01 09:09:03.516604388 -0600 +@@ -27,11 +27,11 @@ $AWSTATS_MODEL_CONFIG $AWSTATS_DIRDATA_PATH /; @@ -17,7 +17,7 @@ $AWSTATS_MODEL_CONFIG='/etc/awstats/awstats.model.conf'; # Used only when configure ran on linux $AWSTATS_DIRDATA_PATH='/var/lib/awstats'; # Used only when configure ran on linux -@@ -306,7 +306,7 @@ +@@ -305,7 +305,7 @@ print "\n-----> Running OS detected: $OSLib{$OS}\n"; if ($OS eq 'linux') { @@ -26,16 +26,18 @@ $AWSTATS_PATH=~s/tools[\\\/]?$//; $AWSTATS_PATH=~s/[\\\/]$//; if ($AWSTATS_PATH ne '/usr/local/awstats') { -@@ -660,6 +660,12 @@ - print "\n-----> Restart Web server with '$command'\n"; - my $ret=`$command`; - print "$ret"; -+ } if (-f "/etc/slackware-version") { +@@ -653,7 +653,13 @@ + # ---------------------------------- + if ($WebServerChanged) { + if ($OS eq 'linux') { +- if (-f "/etc/debian_version") { ++ if (-f "/etc/slackware-version") { + # We are on Slackware :) + my $command="/etc/rc.d/rc.httpd restart"; + print "\n-----> Restart Web server with '$command'\n"; + my $ret=`$command`; + print "$ret"; - } elsif (-x "/sbin/service") { - # We are not on debian - my $command="/sbin/service httpd restart"; ++ } elsif (-f "/etc/debian_version") { + # We are on debian + my $command="/etc/init.d/apache restart"; + print "\n-----> Restart Web server with '$command'\n"; diff --git a/network/awstats/patches/httpd-awstats.conf.patch b/network/awstats/patches/httpd-awstats.conf.patch index 76a276f1aa6ba..082e5e9eeedd0 100644 --- a/network/awstats/patches/httpd-awstats.conf.patch +++ b/network/awstats/patches/httpd-awstats.conf.patch @@ -1,6 +1,6 @@ ---- tools/httpd_conf.orig 2013-11-06 23:39:17.353035049 -0600 -+++ tools/httpd_conf 2013-11-07 07:34:04.009417358 -0600 -@@ -12,18 +12,19 @@ +--- tools/httpd_conf.orig 2013-11-03 16:35:52.000000000 -0600 ++++ tools/httpd_conf 2014-03-01 08:58:34.894297509 -0600 +@@ -12,18 +12,20 @@ # Directives to add to your Apache conf file to allow use of AWStats as a CGI. # Note that path "/usr/local/awstats/" must reflect your AWStats install path. # @@ -8,12 +8,12 @@ -Alias /awstatscss "/usr/local/awstats/wwwroot/css/" -Alias /awstatsicons "/usr/local/awstats/wwwroot/icon/" -ScriptAlias /awstats/ "/usr/local/awstats/wwwroot/cgi-bin/" -- +Alias /awstatsclasses "@DOCROOT@/awstats/wwwroot/classes/" +Alias /awstatscss "@DOCROOT@/awstats/wwwroot/css/" +Alias /awstatsicons "@DOCROOT@/awstats/wwwroot/icon/" +ScriptAlias /awstats/ "@DOCROOT@/awstats/wwwroot/cgi-bin/" + # # This is to permit URL access to scripts/files in AWStats directory. # -- cgit v1.2.3