[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-46-gb487008

[X2Go dev team]

The branch, build-main has been updated
       via  b487008f79052cc4da52e7e6093ff99a3d1a80af (commit)
      from  8c27295aedf58ab801edad949dde0ca121eb5f18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 +
 debian/x2gobroker-wsgi.install                     |    3 +-
 debian/x2gobroker-wsgi.links                       |    3 +-
 ...gi.apache.conf => x2gobroker-wsgi.apache.vhost} |   53 ++++++++++++++++----
 4 files changed, 48 insertions(+), 13 deletions(-)
 copy etc/{x2gobroker-wsgi.apache.conf => x2gobroker-wsgi.apache.vhost} (50%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0b12a34..adbbcd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low
   * New upstream version (0.0.1.1):
     - Add WSGI support to X2Go Session Broker. Allows plugging into
       Apache2 by using the mod_wsgi module.
+    - Add Apache2 configuration for WSGI support that shows how to
+      setup a VirtualHost for X2Go Session Broker.
     - Add cmd and directrdp session profile parameters to defaults.
     - Fix wrong usage of session option »cmd«, has to be »command«.
     - For sessions profiles with autologin enable, add a dummy key
diff --git a/debian/x2gobroker-wsgi.install b/debian/x2gobroker-wsgi.install
index 40b18c5..26c32b7 100644
--- a/debian/x2gobroker-wsgi.install
+++ b/debian/x2gobroker-wsgi.install
@@ -1 +1,2 @@
-etc/x2gobroker-wsgi.apache.conf /etc/x2go/
\ No newline at end of file
+etc/x2gobroker-wsgi.apache.conf /etc/x2go/
+etc/x2gobroker-wsgi.apache.vhost /etc/x2go/
\ No newline at end of file
diff --git a/debian/x2gobroker-wsgi.links b/debian/x2gobroker-wsgi.links
index 99e592a..e1659e5 100644
--- a/debian/x2gobroker-wsgi.links
+++ b/debian/x2gobroker-wsgi.links
@@ -1 +1,2 @@
-/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi
\ No newline at end of file
+/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi
+/etc/x2go/x2gobroker-wsgi.apache.vhost /etc/apache2/sites-available/x2gobroker
diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.vhost
similarity index 50%
copy from etc/x2gobroker-wsgi.apache.conf
copy to etc/x2gobroker-wsgi.apache.vhost
index 63ba34a..4de60a8 100644
--- a/etc/x2gobroker-wsgi.apache.conf
+++ b/etc/x2gobroker-wsgi.apache.vhost
@@ -1,3 +1,12 @@
+###
+### Virtual Host configuration for an X2Go Session Broker
+###
+
+#
+# Make sure to disabled /etc/apache2/x2gobroker-wsgi completely if you
+# prefer setting up the X2Go Session Broker as a virtual host.
+#
+
 # enable debugging
 #SetEnv X2GOBROKER_DEBUG off
 
@@ -8,7 +17,7 @@ WSGIDaemonProcess x2gobroker user=x2gobroker group=x2gobroker processes=5 thread
 WSGIPassAuthorization On
 
 # default broker backend (default: zeroconf)
-SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf
+#SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf
 #SetEnv X2GOBROKER_DEFAULT_BACKEND inifile
 #SetEnv X2GOBROKER_DEFAULT_BACKEND ldap
 #SetEnv X2GOBROKER_DEFAULT_BACKEND <some-other-broker-backend>
@@ -28,17 +37,39 @@ SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf
 # if you have to-be-statically-served files somewhere below the broker URL
 #Alias /x2gobroker/static /some/static/path/
 
-WSGIScriptAlias /x2gobroker /usr/sbin/x2gobroker
+WSGIScriptAlias / /usr/sbin/x2gobroker
 WSGIProcessGroup x2gobroker
 
-<Directory /usr/sbin/x2gobroker>
-    Order deny,allow
-    Deny from all
+<VirtualHost *:443>
+
+    ServerName localhost
+    ServerAdmin webmaster at localhost
+
+    SSLEngine on
+    #   SSL Cipher Suite:
+    SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
+    #   Server Certificate:
+    SSLCertificateFile /etc/x2go/broker/ssl/broker.crt
+    #   Server Private Key:
+    SSLCertificateKeyFile /etc/x2go/broker/ssl/broker.key
+    #SSLCertificateChainFile /etc/x2go/broker/ssl/cacert.key
+    #SetEnvIf User-Agent ".*MSIE.*" \
+    #    nokeepalive ssl-unclean-shutdown \
+    #    downgrade-1.0 force-response-1.0
+
+    <Directory /usr/sbin/x2gobroker>
+        Order deny,allow
+        Deny from all
+
+        # grant explicit access below
+        Allow from localhost
+        Allow from localhost-ip6
+
+        Options +FollowSymLinks
+        Options -Indexes
+
+        SSLOptions +StdEnvVars
 
-    # grant explicit access below
-    Allow from localhost
-    Allow from localhost-ip6
+    </Directory>
 
-    Options +FollowSymLinks
-    Options -Indexes
-</Directory>
+</VirtualHost>


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).