[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.1.0-14-gbf9ca01
X2Go dev team
git-admin at x2go.org
Tue Apr 23 23:21:52 CEST 2013
The branch, build-main has been updated
via bf9ca01cd94266ee47c6ce056a702a942803124c (commit)
from d6e31e806eeb92472e1eaa2c87c3bae3f5d94dc4 (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 +-
etc/x2gobroker-wsgi.apache.vhost | 75 ++++++++++++++++++++++++++++++++++++++
4 files changed, 81 insertions(+), 2 deletions(-)
create mode 100644 etc/x2gobroker-wsgi.apache.vhost
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 07e81e1..dffaa03 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.
- For sessions profiles with autologin enable, add a dummy key
session profile parameter that triggers key based auth in X2Go Client.
(Fixes: #154).
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.vhost b/etc/x2gobroker-wsgi.apache.vhost
new file mode 100644
index 0000000..4de60a8
--- /dev/null
+++ b/etc/x2gobroker-wsgi.apache.vhost
@@ -0,0 +1,75 @@
+###
+### 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
+
+# the default user/group that this WSGI application runs as
+#X2GOBROKER_DAEMON_USER=x2gobroker
+#X2GOBROKER_DAEMON_GROUP=x2gobroker
+WSGIDaemonProcess x2gobroker user=x2gobroker group=x2gobroker processes=5 threads=15
+WSGIPassAuthorization On
+
+# default broker backend (default: zeroconf)
+#SetEnv X2GOBROKER_DEFAULT_BACKEND zeroconf
+#SetEnv X2GOBROKER_DEFAULT_BACKEND inifile
+#SetEnv X2GOBROKER_DEFAULT_BACKEND ldap
+#SetEnv X2GOBROKER_DEFAULT_BACKEND <some-other-broker-backend>
+
+# path to the X2Go Session Broker's configuration file
+#SetEnv X2GOBROKER_CONFIG /etc/x2go/x2gobroker.conf
+
+# path to the X2Go Session Broker's session profiles file (when using the inifile backend)
+#SetEnv X2GOBROKER_SESSIONPROFILES /etc/x2go/broker/x2gobroker-sessionprofiles.conf
+
+# path to the X2Go Session Broker's agent command
+#SetEnv X2GOBROKER_AGENT_CMD /usr/lib/x2go/x2gobroker-agent
+
+# authentication socket of the X2Go Broker's PAM Authentication Service
+#SetEnv X2GOBROKER_AUTHSOCKET /run/x2gobroker/x2gobroker-authservice.socket
+
+# if you have to-be-statically-served files somewhere below the broker URL
+#Alias /x2gobroker/static /some/static/path/
+
+WSGIScriptAlias / /usr/sbin/x2gobroker
+WSGIProcessGroup x2gobroker
+
+<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
+
+ </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).
More information about the x2go-commits
mailing list