[X2Go-Commits] [x2gobroker] 04/06: x2gobroker-wsgi: Place WSGI script symlink (pointing to <BINDIR>/x2gobroker) into a dedicated folder and configure Apache2 to use WSGIScriptAlias from that folder. (See Debian bug #922040).

[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 c68d17fa30dce03dddea0df2aa5769f658ce77ed
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 18 12:22:46 2019 +0100

    x2gobroker-wsgi: Place WSGI script symlink (pointing to <BINDIR>/x2gobroker) into a dedicated folder and configure Apache2 to use WSGIScriptAlias from that folder. (See Debian bug #922040).
---
 Makefile                         | 3 +++
 debian/x2gobroker-wsgi.install   | 1 +
 etc/x2gobroker-wsgi.apache.conf  | 4 ++--
 etc/x2gobroker-wsgi.apache.vhost | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ca1c85f..ad2bec9 100755
--- a/Makefile
+++ b/Makefile
@@ -182,6 +182,9 @@ install:
 	${INSTALL_FILE} etc/x2gobroker-wsgi.apache.{conf,vhost} \
 	        "${DESTDIR}${ETCDIR}/"
 	${INSTALL_FILE} logrotate/x2gobroker-wsgi "${DESTDIR}/etc/logrotate.d/"
+	mkdir -p "${DESTDIR}${LIBDIR}/x2gobroker/wsgi"
+	${INSTALL_SYMLINK} "${BINDIR}/x2gobroker" \
+	        "${DESTDIR}${LIBDIR}/x2gobroker/wsgi/x2gobroker-wsgi"
 
 	# x2gobroker
 	mkdir -p "${DESTDIR}${BINDIR}" "${DESTDIR}${SBINDIR}" \
diff --git a/debian/x2gobroker-wsgi.install b/debian/x2gobroker-wsgi.install
index 743a1cc..42b6b92 100644
--- a/debian/x2gobroker-wsgi.install
+++ b/debian/x2gobroker-wsgi.install
@@ -1,3 +1,4 @@
 etc/x2go/x2gobroker-wsgi.apache.conf
 etc/x2go/x2gobroker-wsgi.apache.vhost
 etc/logrotate.d/x2gobroker-wsgi
+usr/lib/x2gobroker/wsgi/
diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf
index 3ee97ee..42da235 100644
--- a/etc/x2gobroker-wsgi.apache.conf
+++ b/etc/x2gobroker-wsgi.apache.conf
@@ -28,10 +28,10 @@ SetEnv X2GOBROKER_DEFAULT_BACKEND inifile
 # if you have to-be-statically-served files somewhere below the broker URL
 #Alias /x2gobroker/static /some/static/path/
 
-WSGIScriptAlias /x2gobroker /usr/bin/x2gobroker
+WSGIScriptAlias /x2gobroker /usr/lib/x2gobroker/wsgi/x2gobroker-wsgi
 WSGIProcessGroup x2gobroker
 
-<Directory /usr/bin/x2gobroker>
+<Directory /usr/lib/x2gobroker/wsgi>
 
     Require local
 
diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost
index 9b9e1cd..44df536 100644
--- a/etc/x2gobroker-wsgi.apache.vhost
+++ b/etc/x2gobroker-wsgi.apache.vhost
@@ -42,10 +42,10 @@
     # if you have to-be-statically-served files somewhere below the broker URL
     #Alias /x2gobroker/static /some/static/path/
 
-    WSGIScriptAlias / /usr/bin/x2gobroker
+    WSGIScriptAlias / /usr/lib/x2gobroker/wsgi/x2goroker-wsgi
     WSGIProcessGroup x2gobroker
 
-    <Directory /usr/bin/x2gobroker>
+    <Directory /usr/lib/x2gobroker/wsgi>
 
         Require local
 

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