The branch, build-main has been updated via 830502fcaa69733d4c5f6561d335a5f7032c4baa (commit) from 48ca859f6e7950c9f08d20ac7c79feff70a65b2e (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: etc/x2gobroker.conf | 3 +++ sbin/x2gobroker | 1 + x2gobroker/defaults.py | 1 + 3 files changed, 5 insertions(+) The diff of changes is: diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 24a530f..85eaa77 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -71,6 +71,9 @@ # enable {base_url}/plain/ #enable-plain-output = true +# enable {base_url}/uccs/ +#enable-uccs-output = false + # enable {base_url}/json/ (THIS IS FUTURE, mg-20121129) #enable-json-output = false diff --git a/sbin/x2gobroker b/sbin/x2gobroker index a092172..bc28d0b 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -113,6 +113,7 @@ import x2gobroker.web.extras # define the web.py URLs urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), + ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,), # ('/json/(.*)', x2gobroker.web.json.X2GoBrokerWeb,), # ('/html/(.*)', x2gobroker.web.html.X2GoBrokerWeb,), ('/pubkeys/', x2gobroker.web.extras.X2GoBrokerPubKeyService,), diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index cfc7372..fcbb8ca 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -118,6 +118,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { u'use-static-cookie': False, u'my-cookie': uuid.uuid4(), u'enable-plain-output': True, + u'enable-uccs-output': False, u'enable-json-output': False, u'enable-html-output': False, u'default-auth-mech': u'pam', 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).