[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.2.0-7-ga543b6d
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:46 CEST 2013
The branch, build-main has been updated
via a543b6df7faa4ec5d008304e4f16512109817cac (commit)
from 1cbf2c397ba3253681e4303e52017da30f48f2eb (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 +
etc/x2gobroker-wsgi.apache.vhost | 78 +++++++++++++++++++-------------------
2 files changed, 41 insertions(+), 39 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index aa10d08..5e2f943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ x2gobroker (0.0.2.1-0~x2go1) UNRELEASED; urgency=low
* New upstream version (0.0.2.0):
- Remove trainling slashes from ManagementServer URLs.
+ - In Apache2 vhost configuration example, move WSGI environment
+ variable settings into VirtualHost setup.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 01 May 2013 21:07:41 +0200
diff --git a/etc/x2gobroker-wsgi.apache.vhost b/etc/x2gobroker-wsgi.apache.vhost
index 4de60a8..931f7d2 100644
--- a/etc/x2gobroker-wsgi.apache.vhost
+++ b/etc/x2gobroker-wsgi.apache.vhost
@@ -7,55 +7,43 @@
# 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
+<VirtualHost *:443>
-# 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>
+ ServerName localhost
+ ServerAdmin webmaster at localhost
-# path to the X2Go Session Broker's configuration file
-#SetEnv X2GOBROKER_CONFIG /etc/x2go/x2gobroker.conf
+ # enable debugging
+ #SetEnv X2GOBROKER_DEBUG off
-# path to the X2Go Session Broker's session profiles file (when using the inifile backend)
-#SetEnv X2GOBROKER_SESSIONPROFILES /etc/x2go/broker/x2gobroker-sessionprofiles.conf
+ # 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
-# path to the X2Go Session Broker's agent command
-#SetEnv X2GOBROKER_AGENT_CMD /usr/lib/x2go/x2gobroker-agent
+ # 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>
-# authentication socket of the X2Go Broker's PAM Authentication Service
-#SetEnv X2GOBROKER_AUTHSOCKET /run/x2gobroker/x2gobroker-authservice.socket
+ # path to the X2Go Session Broker's configuration file
+ #SetEnv X2GOBROKER_CONFIG /etc/x2go/x2gobroker.conf
-# if you have to-be-statically-served files somewhere below the broker URL
-#Alias /x2gobroker/static /some/static/path/
+ # path to the X2Go Session Broker's session profiles file (when using the inifile backend)
+ #SetEnv X2GOBROKER_SESSIONPROFILES /etc/x2go/broker/x2gobroker-sessionprofiles.conf
-WSGIScriptAlias / /usr/sbin/x2gobroker
-WSGIProcessGroup x2gobroker
+ # path to the X2Go Session Broker's agent command
+ #SetEnv X2GOBROKER_AGENT_CMD /usr/lib/x2go/x2gobroker-agent
-<VirtualHost *:443>
+ # authentication socket of the X2Go Broker's PAM Authentication Service
+ #SetEnv X2GOBROKER_AUTHSOCKET /run/x2gobroker/x2gobroker-authservice.socket
- ServerName localhost
- ServerAdmin webmaster at localhost
+ # if you have to-be-statically-served files somewhere below the broker URL
+ #Alias /x2gobroker/static /some/static/path/
- 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
+ WSGIScriptAlias / /usr/sbin/x2gobroker
+ WSGIProcessGroup x2gobroker
<Directory /usr/sbin/x2gobroker>
Order deny,allow
@@ -72,4 +60,16 @@ WSGIProcessGroup x2gobroker
</Directory>
+ 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
+
</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