[packages/awstats] - migrate to apache 2.4

baggins baggins at pld-linux.org
Wed May 15 18:07:26 CEST 2013


commit 963822673ec8c8a40c7630986bf50d12dee9c68d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 18:07:10 2013 +0200

    - migrate to apache 2.4

 awstats-httpd.conf | 7 +++----
 awstats.spec       | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/awstats.spec b/awstats.spec
index 953d63f..cda8acc 100644
--- a/awstats.spec
+++ b/awstats.spec
@@ -29,6 +29,7 @@ Requires:	perl-Geo-IP
 Requires:	perl-Storable
 Requires:	perl-Time-HiRes
 Requires:	webapps
+Conflicts:	apache < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -94,10 +95,10 @@ ln -s %{_datadir}/awstats/wwwroot/cgi-bin/awstats.pl $RPM_BUILD_ROOT%{_bindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerin -- lighttpd
diff --git a/awstats-httpd.conf b/awstats-httpd.conf
index 7b40baf..1591978 100644
--- a/awstats-httpd.conf
+++ b/awstats-httpd.conf
@@ -5,8 +5,7 @@ Alias /js/awstats_misc_tracker.js "/usr/share/awstats/wwwroot/js/awstats_misc_tr
 ScriptAlias /awstats/ "/usr/share/awstats/wwwroot/cgi-bin/"
 
 <Directory "/usr/share/awstats/wwwroot">
-Options None
-AllowOverride None
-Order allow,deny
-Allow from all
+	Options None
+	AllowOverride None
+	Require all granted
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/awstats.git/commitdiff/963822673ec8c8a40c7630986bf50d12dee9c68d



More information about the pld-cvs-commit mailing list