commit bf3f7c79712e6050d1d397770ee5ec07a4a728b4
Author: Elan Ruusamäe <[email protected]>
Date:   Thu Aug 8 14:01:20 2013 +0300

    use unified config for apache versions

 apache.conf   | 18 ++++++++++++++++--
 ckfinder.spec |  2 +-
 find-lang.sh  |  0
 3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/ckfinder.spec b/ckfinder.spec
index a3cc9a8..cf3ba01 100644
--- a/ckfinder.spec
+++ b/ckfinder.spec
@@ -2,7 +2,7 @@ Summary:        AJAX file manager for web browsers
 Summary(pl.UTF-8):     Edytor tekstowy dla Internetu
 Name:          ckfinder
 Version:       1.4.2
-Release:       2
+Release:       3
 License:       Custom
 Group:         Applications/WWW
 Source0:       
http://download.cksource.com/CKFinder/CKFinder%20for%20PHP/%{version}/%{name}_php_%{version}.tar.gz
diff --git a/apache.conf b/apache.conf
index da50176..7ca1bc4 100644
--- a/apache.conf
+++ b/apache.conf
@@ -2,11 +2,25 @@ Alias /ckfinder/userfiles/ /var/lib/ckfinder/
 Alias /ckfinder/ /usr/share/ckfinder/
 
 <Directory /usr/share/ckfinder>
-       Allow from all
+       <IfModule mod_authz_core.c>
+               # Apache 2.4
+               Require all granted
+       </IfModule>
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
 </Directory>
 
 <Directory /var/lib/ckfinder>
-       Allow from all
+       <IfModule mod_authz_core.c>
+               # Apache 2.4
+               Require all granted
+       </IfModule>
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
        <IfModule mod_php5.c>
                php_value engine off
        </IfModule>
diff --git a/find-lang.sh b/find-lang.sh
old mode 100644
new mode 100755
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ckfinder.git/commitdiff/bf3f7c79712e6050d1d397770ee5ec07a4a728b4

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to