commit b042bedccf4f9259b39c85cc9cc1d8d173ffdf6f
Author: Elan Ruusamäe <[email protected]>
Date: Tue Feb 25 19:28:54 2014 +0200
apache 2.2/2.4 compatible config
apache.conf | 29 +++++++++++++++++++----------
pootle.spec | 6 +++---
2 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/pootle.spec b/pootle.spec
index e436b35..f80cf22 100644
--- a/pootle.spec
+++ b/pootle.spec
@@ -4,10 +4,9 @@
Summary: Localization and translation management web application
Name: pootle
Version: 2.1.6
-Release: 2
+Release: 4
License: GPL v2
Group: Development/Tools
-URL: http://translate.sourceforge.net/wiki/pootle/index
Source0:
http://downloads.sourceforge.net/translate/%{fullname}-%{version}.tar.bz2
# Source0-md5: 1dc69e42cd93f9174443af350df57491
Source1: apache.conf
@@ -16,6 +15,7 @@ Patch1: paths.patch
Patch2: homedir.patch
Patch3: iso-codes-message.patch
Patch4: bug-2005.patch
+URL: http://translate.sourceforge.net/wiki/pootle/index
BuildRequires: python-devel
BuildRequires: python-modules
BuildRequires: rpm-pythonprov
@@ -148,7 +148,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
# we do doc in rpm
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/pootle
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
# external pkg
rm -r $RPM_BUILD_ROOT%{py_sitescriptdir}/djblets
diff --git a/apache.conf b/apache.conf
index 64858ca..7e9eda6 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,19 +1,28 @@
WSGIScriptAlias /pootle /usr/share/pootle/wsgi.py
<Directory /usr/share/pootle>
- Order deny,allow
- Allow from all
+ # Apache 2.x
+ <IfModule !mod_authz_core.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
+ # Apache 2.4
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
</Directory>
Alias /pootle/html /usr/share/pootle/html
-<Directory /usr/share/pootle/html>
- Order deny,allow
- Allow from all
-</Directory>
-
Alias /pootle/export /var/lib/pootle/po
-<Directory "/var/lib/pootle/po">
- Order deny,allow
- Allow from all
+<Directory ~ "/usr/share/pootle/(html|po)">
+ # Apache 2.x
+ <IfModule !mod_authz_core.c>
+ Order allow,deny
+ Allow from all
+ </IfModule>
+ # Apache 2.4
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
</Directory>
<IfModule mod_deflate.c>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pootle.git/commitdiff/b042bedccf4f9259b39c85cc9cc1d8d173ffdf6f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
