[X2Go-Commits] [x2gobroker] 02/02: etc/x2gobroker-wsgi.apache.*: Drop Apache2.2 support.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 30 19:32:58 CEST 2018


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit af54273009b5311f93167fa10bf5b452526c9aba
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 30 19:32:48 2018 +0200

    etc/x2gobroker-wsgi.apache.*: Drop Apache2.2 support.
---
 etc/x2gobroker-wsgi.apache.conf  | 13 ++-----------
 etc/x2gobroker-wsgi.apache.vhost | 12 +-----------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf
index 80316f4..3ee97ee 100644
--- a/etc/x2gobroker-wsgi.apache.conf
+++ b/etc/x2gobroker-wsgi.apache.conf
@@ -33,18 +33,9 @@ WSGIProcessGroup x2gobroker
 
 <Directory /usr/bin/x2gobroker>
 
-    <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>
+    Require local
 
     Options +FollowSymLinks
     Options -Indexes
+
 </Directory>
diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost
index 6852830..9b9e1cd 100644
--- a/etc/x2gobroker-wsgi.apache.vhost
+++ b/etc/x2gobroker-wsgi.apache.vhost
@@ -47,17 +47,7 @@
 
     <Directory /usr/bin/x2gobroker>
 
-        <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>
+        Require local
 
         Options +FollowSymLinks
         Options -Indexes

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list