commit b2638b804f3eca3fe597632fda9d366581e88675
Author: Elan Ruusamäe <[email protected]>
Date: Thu Sep 26 23:52:07 2013 +0300
multi apache version config
trac-apache.conf | 22 ++++++++++++++++++----
trac.spec | 2 +-
2 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/trac.spec b/trac.spec
index dd7f75d..a66600e 100644
--- a/trac.spec
+++ b/trac.spec
@@ -6,7 +6,7 @@ Summary(pl.UTF-8): Zintegrowane scm, wiki, system
śledzenia problemów i środo
Name: trac
# NOTE 1.x is on DEVEL branch, finish it there and then merge
Version: 0.12.5
-Release: 4
+Release: 5
License: BSD-like
Group: Applications/WWW
Source0: http://ftp.edgewall.com/pub/trac/Trac-%{version}.tar.gz
diff --git a/trac-apache.conf b/trac-apache.conf
index c2b60aa..0467399 100644
--- a/trac-apache.conf
+++ b/trac-apache.conf
@@ -6,8 +6,15 @@ AliasMatch ^/trac/([^/]+)/chrome/common/(.*)
/usr/share/trac/htdocs/$2
AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*) /usr/share/trac/htdocs/$2/$3
<Directory "/usr/share/trac/htdocs">
- Order allow,deny
- 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>
# TracModPython
@@ -32,7 +39,15 @@ AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*)
/usr/share/trac/htdocs/$2/$3
<IfModule mod_env.c>
SetEnv TRAC_ENV_PARENT_DIR /var/lib/trac
</IfModule>
- 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>
</Location>
</IfModule>
@@ -42,5 +57,4 @@ AliasMatch ^/trac/([^/]+/)?chrome/([^/]+)/(.*)
/usr/share/trac/htdocs/$2/$3
AuthName "trac"
AuthUserFile /etc/webapps/trac/htpasswd
Require valid-user
- Allow from all
</Location>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/trac.git/commitdiff/b2638b804f3eca3fe597632fda9d366581e88675
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
