[X2Go-Commits] [x2gobroker] 04/09: etc/x2gobroker-wsgi.*.conf: Make host ACLs Apache2.4 compliant.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit ddbc2e3f0fcc041485cfcc9c31ad12996737aeb6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 30 16:05:19 2015 +0200

    etc/x2gobroker-wsgi.*.conf: Make host ACLs Apache2.4 compliant.
---
 etc/x2gobroker-wsgi.apache.conf  |   16 +++++++++++-----
 etc/x2gobroker-wsgi.apache.vhost |   16 +++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf
index cb85385..80316f4 100644
--- a/etc/x2gobroker-wsgi.apache.conf
+++ b/etc/x2gobroker-wsgi.apache.conf
@@ -32,12 +32,18 @@ WSGIScriptAlias /x2gobroker /usr/bin/x2gobroker
 WSGIProcessGroup x2gobroker
 
 <Directory /usr/bin/x2gobroker>
-    Order deny,allow
-    Deny from all
 
-    # grant explicit access below
-    Allow from 127.0.0.1
-    Allow from ::1
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+         # Apache 2.2
+         Order Deny,Allow
+         Deny from all
+         Allow from 127.0.0.1
+         Allow from ::1
+    </IfModule>
 
     Options +FollowSymLinks
     Options -Indexes
diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost
index 4cc7a2a..6852830 100644
--- a/etc/x2gobroker-wsgi.apache.vhost
+++ b/etc/x2gobroker-wsgi.apache.vhost
@@ -46,12 +46,18 @@
     WSGIProcessGroup x2gobroker
 
     <Directory /usr/bin/x2gobroker>
-        Order deny,allow
-        Deny from all
 
-        # grant explicit access below
-        Allow from 127.0.0.1
-        Allow from ::1
+        <IfModule mod_authz_core.c>
+            # Apache 2.4
+            Require local
+        </IfModule>
+        <IfModule !mod_authz_core.c>
+            # Apache 2.2
+            Order Deny,Allow
+            Deny from all
+            Allow from 127.0.0.1
+            Allow from ::1
+        </IfModule>
 
         Options +FollowSymLinks
         Options -Indexes

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git