x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

x2gobroker.git - uccsoutput (branch) updated: 0.0.1.0-32-g3366ab1
by git-admin＠x2go.org 10 Apr '13

10 Apr '13

The branch, uccsoutput has been updated via 3366ab187d971a0de2bf2f13d33c02e24ce77ed5 (commit) via 87e0d33ee82cbbc48ff738d5fa33a49a7b9f904f (commit) via f5c77c7654c180c9f55f175b9dc2a611a4a26a1c (commit) via 12ace4ff77e043274948ada6f13ffedc5e561d26 (commit) via d3a17b136b23755840e13547152011193c2febe9 (commit) via cbe481e17814bf14404b4adc95fc6ae53efa52a1 (commit) via 5f08ed5c43d6c8c96515f5628d3a60cb0c386ab7 (commit) via a505addd53fee98a0445278c838447b4b20e3d1b (commit) via 9ec668c96ad7a70e1024194c3f7eae7ea3e9e6ba (commit) via b075080bcd2a1510f4ac820f752580000712e509 (commit) via d76dcd7f32e82452e74e167ff9de4020403ecb84 (commit) via b24fe4ed32dc3f3066f20b4f93f1df5bbbdaa778 (commit) via b440438bdbdcdd248957f6e2e0cfe4deaab895b5 (commit) via 830502fcaa69733d4c5f6561d335a5f7032c4baa (commit) via 48ca859f6e7950c9f08d20ac7c79feff70a65b2e (commit) via 17d847151ef8803f9e973ddbe9e8b47c56d30623 (commit) via 3eece58572d42b888f3f922eac9ca7f64937a2da (commit) via 5a4f129a152362b5bfb133d39638274ed0c65f41 (commit) from 317325dd112ba89775ff81984ef985f061a81b21 (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 ----------------------------------------------------------------- commit 3366ab187d971a0de2bf2f13d33c02e24ce77ed5 Merge: 87e0d33 317325d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 10 11:20:39 2013 +0200 Merge branch 'uccsoutput' of ssh://code.x2go.org:32032/~/git/./x2gobroker into uccsoutput Conflicts (resolved by Mike Gabriel): debian/changelog commit 87e0d33ee82cbbc48ff738d5fa33a49a7b9f904f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 12:01:15 2013 +0200 add listsessions test for UCCS web frontend commit f5c77c7654c180c9f55f175b9dc2a611a4a26a1c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 12:00:51 2013 +0200 remove debug output commit 12ace4ff77e043274948ada6f13ffedc5e561d26 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 11:38:48 2013 +0200 enable BR tests in test unit commit d3a17b136b23755840e13547152011193c2febe9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 10:21:27 2013 +0200 commit after more (successful) testing of UCCS compat code commit cbe481e17814bf14404b4adc95fc6ae53efa52a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 10:08:09 2013 +0200 Fix wrong usage of session option »cmd«, has to be »command«. commit 5f08ed5c43d6c8c96515f5628d3a60cb0c386ab7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 14:01:40 2013 +0200 add test that checks profile completion from hard-coded defaults commit a505addd53fee98a0445278c838447b4b20e3d1b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:39:43 2013 +0200 Add cmd and directrdp session profile parameters to defaults. commit 9ec668c96ad7a70e1024194c3f7eae7ea3e9e6ba Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:37:33 2013 +0200 sbin/x2gobroker: import UCCS web frontend commit b075080bcd2a1510f4ac820f752580000712e509 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:36:38 2013 +0200 fix x2gobroker/web/uccs.py commit d76dcd7f32e82452e74e167ff9de4020403ecb84 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:26:27 2013 +0200 new parameter in default profile commit b24fe4ed32dc3f3066f20b4f93f1df5bbbdaa778 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:03:58 2013 +0200 move UCCS JSON classes into separate file commit b440438bdbdcdd248957f6e2e0cfe4deaab895b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 3 21:42:21 2013 +0000 more work on UCCS compatible mode commit 830502fcaa69733d4c5f6561d335a5f7032c4baa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 3 09:49:17 2013 +0200 start development of the UCCS compatible output frontend ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +- debian/control | 104 ++++++++++---------- debian/rules | 8 +- debian/x2gobroker-agent.postrm | 8 +- debian/x2gobroker-daemon.postrm | 9 +- debian/x2gobroker-wsgi.install | 1 + debian/x2gobroker-wsgi.links | 1 + ...er-daemon.postinst => x2gobroker-wsgi.postinst} | 0 ...broker-daemon.postrm => x2gobroker-wsgi.postrm} | 9 +- etc/x2gobroker-wsgi.apache.conf | 43 ++++++++ sbin/x2gobroker | 26 ++++- 11 files changed, 147 insertions(+), 68 deletions(-) delete mode 100644 debian/x2gobroker-cgi.install create mode 100644 debian/x2gobroker-wsgi.install create mode 100644 debian/x2gobroker-wsgi.links copy debian/{x2gobroker-daemon.postinst => x2gobroker-wsgi.postinst} (100%) copy debian/{x2gobroker-daemon.postrm => x2gobroker-wsgi.postrm} (84%) create mode 100644 etc/x2gobroker-wsgi.apache.conf The diff of changes is: diff --git a/debian/changelog b/debian/changelog index be2985b..4936e35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.1.1): - - Add command and directrdp session profile parameters to defaults. + - Add WSGI support to X2Go Session Broker. Allows plugging into + Apache2 by using the mod_wsgi module. + - Add cmd and directrdp session profile parameters to defaults. - Fix wrong usage of session option »cmd«, has to be »command«. + * /debian/control: + + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100 diff --git a/debian/control b/debian/control index eb7187c..45e0eae 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: x2gobroker -Section: python +Section: misc Priority: optional Maintainer: X2Go Developers <x2go-dev(a)lists.berlios.de> Uploaders: @@ -13,14 +13,47 @@ Build-Depends: python-setuptools, python-nose, python-paste, -Standards-Version: 3.9.3 -XS-Python-Version: >= 2.4 +Standards-Version: 3.9.4 -Package: x2gobroker +Package: python-x2gobroker +Section: python Architecture: all Depends: + ${python:Depends}, ${misc:Depends}, + python, + python-pampy, + python-netaddr, + python-tornado, + python-paramiko, +Description: X2Go http(s) based session broker (Python modules) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains common files needed by all X2Go session + brokers being package for this distribution. +XS-Python-Version: >= 2.6 + +Package: x2gobroker +Architecture: all +Depends: ${python:Depends}, + ${misc:Depends}, python, python-argparse, python-setproctitle, @@ -52,13 +85,13 @@ Description: X2Go http(s) based session broker (executable) Package: x2gobroker-authservice Architecture: all Depends: + ${python:Depends}, + ${misc:Depends}, python, python-argparse, python-setproctitle, - ${misc:Depends}, - ${python:Depends}, Suggests: - apache2 | httpd, + x2gobroker-daemon, Description: X2Go http(s) based session broker (PAM authentication service) X2Go is a server based computing environment with - session resuming @@ -85,13 +118,10 @@ Package: x2gobroker-daemon Architecture: all Depends: ${misc:Depends}, - ${python:Depends}, adduser, x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~), Recommends: x2gobroker-authservice, -Suggests: - apache2 | httpd, Description: X2Go http(s) based session broker (daemon) X2Go is a server based computing environment with - session resuming @@ -115,48 +145,17 @@ Description: X2Go http(s) based session broker (daemon) installs the X2Go Session Broker as standalone daemon. -#Package: x2gobroker-cgi -#Architecture: all -#Depends: -# ${misc:Depends}, -# ${python:Depends}, -#Suggests: -# apache2 | httpd, -#Description: X2Go http(s) based session broker (CGI) -# X2Go is a server based computing environment with -# - session resuming -# - low bandwidth support -# - LDAP support -# - client side mass storage mounting support -# - client side printing support -# - audio support -# - authentication by smartcard and USB stick -# . -# The session broker is a server tool for X2Go that -# tells your X2Go Client application in a terminal -# server cluster what servers and session types are -# most appropriate for the user in front of the -# X2Go terminal. -# . -# A session broker is most useful in load balanced -# X2Go server farms. -# . -# This package contains a configuration that installs -# the X2Go Session Broker as a CGI script so it -# can be run from within an existing httpd server. - -Package: python-x2gobroker +Package: x2gobroker-wsgi Architecture: all Depends: ${misc:Depends}, ${python:Depends}, - python-pampy, - python-netaddr, - python-tornado, - python-paramiko, + python, + adduser, + python-wsgilog, Suggests: - apache2 | httpd, -Description: X2Go http(s) based session broker (Python modules) + apache2, +Description: X2Go http(s) based session broker (CGI) X2Go is a server based computing environment with - session resuming - low bandwidth support @@ -175,16 +174,21 @@ Description: X2Go http(s) based session broker (Python modules) A session broker is most useful in load balanced X2Go server farms. . - This package contains common files needed by all X2Go session - brokers being package for this distribution. + This package contains an Apache2 configuration that + installs the X2Go Session Broker as a WSGI application + into a running Apache2 httpd. Package: x2gobroker-agent Architecture: any Depends: ${shlibs:Depends}, + ${python:Depends}, ${misc:Depends}, - perl, python, + python-setproctitle, + python-argparse, + python-paramiko, + perl, adduser, x2goserver, Description: X2Go http(s) based session broker (common files) diff --git a/debian/rules b/debian/rules index 28be4dc..321f0cc 100755 --- a/debian/rules +++ b/debian/rules @@ -22,12 +22,12 @@ #export DEB_CFLAGS_MAINT_APPEND = -Wall #include /usr/share/dpkg/buildflags.mk -DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") -DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb --single-version-externally-managed - include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk + +DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") +DEB_PYTHON_INSTALL_ARGS_python-x2gobroker ?= --root=$(DEB_DESTDIR) --prefix=$(DEB_PYTHON_PREFIX_ARG) --no-compile -O0 --install-layout=deb include /usr/share/cdbs/1/class/python-distutils.mk +include /usr/share/cdbs/1/class/makefile.mk # needed when building with pysupport (e.g. on Ubuntu lucid) common-binary-indep:: diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm index bc535ee..9b74861 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/x2gobroker-agent.postrm @@ -18,11 +18,17 @@ set -e case "$1" in purge) + if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent 1>/dev/null; then dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent fi - if [ ! -d /usr/share/doc/x2gobroker-daemon ]; then + if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then + + if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker + fi + # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-cgi.install b/debian/x2gobroker-cgi.install deleted file mode 100644 index e69de29..0000000 diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm index 34a8687..a1e2845 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-daemon.postrm @@ -19,11 +19,12 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then - dpkg-statoverride --remove /var/log/x2gobroker - fi + if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then + + if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker + fi - if [ ! -d /usr/share/doc/x2gobroker-agent ]; then # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-wsgi.install b/debian/x2gobroker-wsgi.install new file mode 100644 index 0000000..40b18c5 --- /dev/null +++ b/debian/x2gobroker-wsgi.install @@ -0,0 +1 @@ +etc/x2gobroker-wsgi.apache.conf /etc/x2go/ \ No newline at end of file diff --git a/debian/x2gobroker-wsgi.links b/debian/x2gobroker-wsgi.links new file mode 100644 index 0000000..99e592a --- /dev/null +++ b/debian/x2gobroker-wsgi.links @@ -0,0 +1 @@ +/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi \ No newline at end of file diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-wsgi.postinst similarity index 100% copy from debian/x2gobroker-daemon.postinst copy to debian/x2gobroker-wsgi.postinst diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-wsgi.postrm similarity index 84% copy from debian/x2gobroker-daemon.postrm copy to debian/x2gobroker-wsgi.postrm index 34a8687..006022f 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-wsgi.postrm @@ -19,11 +19,12 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then - dpkg-statoverride --remove /var/log/x2gobroker - fi + if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then + + if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker + fi - if [ ! -d /usr/share/doc/x2gobroker-agent ]; then # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf new file mode 100644 index 0000000..92c432f --- /dev/null +++ b/etc/x2gobroker-wsgi.apache.conf @@ -0,0 +1,43 @@ +# 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 + +# 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 /x2gobroker /usr/sbin/x2gobroker +WSGIProcessGroup x2gobroker + +<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 +</Directory> diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 894b3c0..5abd86d 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -27,9 +27,6 @@ import argparse import socket import logging import thread -import tornado.web -import tornado.httpserver -import tornado.ioloop try: import x2gobroker.defaults @@ -126,10 +123,13 @@ urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), settings = { 'log_function': tornado_log_request, } -application = tornado.web.Application(urls, **settings) # run the web.py standalone daemon... if __name__ == "__main__": + import tornado.web + import tornado.httpserver + import tornado.ioloop + application = tornado.web.Application(urls, **settings) try: if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: # switch on https:// mode @@ -146,3 +146,21 @@ if __name__ == "__main__": tornado.ioloop.IOLoop.instance().start() except socket.error, e: print (e) +else: + import tornado.wsgi + import wsgilog + _tornado_application = tornado.wsgi.WSGIApplication(urls, **settings) + + def _application(environ, start_response): + + # some WSGI implementations do not like the SCRIPT_NAME env var + if 'SCRIPT_NAME' in environ: + del environ['SCRIPT_NAME'] + + # make sure the httpd server's environment is set as os.environ + os.environ = environ + reload(x2gobroker.defaults) + + return _tornado_application(environ, start_response) + + application = wsgilog.WsgiLog(_application, tohtml=True, tofile=True, tostream=False, toprint=False, file='/var/log/x2gobroker/wsgi.log', ) 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-5-g48ca859
by git-admin＠x2go.org 10 Apr '13

10 Apr '13

The branch, master has been updated via 48ca859f6e7950c9f08d20ac7c79feff70a65b2e (commit) from 17d847151ef8803f9e973ddbe9e8b47c56d30623 (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 ----------------------------------------------------------------- commit 48ca859f6e7950c9f08d20ac7c79feff70a65b2e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 10 10:56:44 2013 +0200 fix x2gobroker-wsgi.install ----------------------------------------------------------------------- Summary of changes: debian/x2gobroker-wsgi.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/x2gobroker-wsgi.install b/debian/x2gobroker-wsgi.install index d85d699..40b18c5 100644 --- a/debian/x2gobroker-wsgi.install +++ b/debian/x2gobroker-wsgi.install @@ -1 +1 @@ -etc/x2gobroker-apache.conf /etc/x2go/ \ No newline at end of file +etc/x2gobroker-wsgi.apache.conf /etc/x2go/ \ No newline at end of file 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).

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-4-g17d8471
by git-admin＠x2go.org 10 Apr '13

10 Apr '13

The branch, master has been updated via 17d847151ef8803f9e973ddbe9e8b47c56d30623 (commit) via 3eece58572d42b888f3f922eac9ca7f64937a2da (commit) from 5a4f129a152362b5bfb133d39638274ed0c65f41 (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 ----------------------------------------------------------------- commit 17d847151ef8803f9e973ddbe9e8b47c56d30623 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 10 10:48:07 2013 +0200 Add WSGI support to X2Go Session Broker. Allows plugging into Apache2 by using the mod_wsgi module. commit 3eece58572d42b888f3f922eac9ca7f64937a2da Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 9 23:08:29 2013 +0200 /debian/control: Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +- debian/control | 65 +++++++++++--------- debian/rules | 2 +- debian/x2gobroker-agent.postrm | 8 ++- debian/x2gobroker-daemon.postrm | 9 +-- debian/x2gobroker-wsgi.install | 1 + debian/x2gobroker-wsgi.links | 1 + ...er-daemon.postinst => x2gobroker-wsgi.postinst} | 0 ...broker-daemon.postrm => x2gobroker-wsgi.postrm} | 9 +-- etc/x2gobroker-wsgi.apache.conf | 43 +++++++++++++ sbin/x2gobroker | 26 ++++++-- 11 files changed, 126 insertions(+), 44 deletions(-) delete mode 100644 debian/x2gobroker-cgi.install create mode 100644 debian/x2gobroker-wsgi.install create mode 100644 debian/x2gobroker-wsgi.links copy debian/{x2gobroker-daemon.postinst => x2gobroker-wsgi.postinst} (100%) copy debian/{x2gobroker-daemon.postrm => x2gobroker-wsgi.postrm} (84%) create mode 100644 etc/x2gobroker-wsgi.apache.conf The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 52d3774..caddae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.1.1): + - Add WSGI support to X2Go Session Broker. Allows plugging into + Apache2 by using the mod_wsgi module. + * /debian/control: + + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 10 Mar 2013 13:00:32 +0100 diff --git a/debian/control b/debian/control index 545adac..45e0eae 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, + python, python-pampy, python-netaddr, python-tornado, @@ -53,6 +54,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, + python, python-argparse, python-setproctitle, python-tornado, @@ -85,6 +87,7 @@ Architecture: all Depends: ${python:Depends}, ${misc:Depends}, + python, python-argparse, python-setproctitle, Suggests: @@ -142,35 +145,38 @@ Description: X2Go http(s) based session broker (daemon) installs the X2Go Session Broker as standalone daemon. -#Package: x2gobroker-cgi -#Architecture: all -#Depends: -# ${misc:Depends}, -# ${python:Depends}, -#Suggests: -# apache2 | httpd, -#Description: X2Go http(s) based session broker (CGI) -# X2Go is a server based computing environment with -# - session resuming -# - low bandwidth support -# - LDAP support -# - client side mass storage mounting support -# - client side printing support -# - audio support -# - authentication by smartcard and USB stick -# . -# The session broker is a server tool for X2Go that -# tells your X2Go Client application in a terminal -# server cluster what servers and session types are -# most appropriate for the user in front of the -# X2Go terminal. -# . -# A session broker is most useful in load balanced -# X2Go server farms. -# . -# This package contains a configuration that installs -# the X2Go Session Broker as a CGI script so it -# can be run from within an existing httpd server. +Package: x2gobroker-wsgi +Architecture: all +Depends: + ${misc:Depends}, + ${python:Depends}, + python, + adduser, + python-wsgilog, +Suggests: + apache2, +Description: X2Go http(s) based session broker (CGI) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client side mass storage mounting support + - client side printing support + - audio support + - authentication by smartcard and USB stick + . + The session broker is a server tool for X2Go that + tells your X2Go Client application in a terminal + server cluster what servers and session types are + most appropriate for the user in front of the + X2Go terminal. + . + A session broker is most useful in load balanced + X2Go server farms. + . + This package contains an Apache2 configuration that + installs the X2Go Session Broker as a WSGI application + into a running Apache2 httpd. Package: x2gobroker-agent Architecture: any @@ -178,6 +184,7 @@ Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}, + python, python-setproctitle, python-argparse, python-paramiko, diff --git a/debian/rules b/debian/rules index 5521e3b..321f0cc 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") -DEB_PYTHON_INSTALL_ARGS_python-x2gobroker ?= --root --prefix=$(DEB_PYTHON_PREFIX_ARG) --no-compile -O0 --install-layout=deb +DEB_PYTHON_INSTALL_ARGS_python-x2gobroker ?= --root=$(DEB_DESTDIR) --prefix=$(DEB_PYTHON_PREFIX_ARG) --no-compile -O0 --install-layout=deb include /usr/share/cdbs/1/class/python-distutils.mk include /usr/share/cdbs/1/class/makefile.mk diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm index bc535ee..9b74861 100755 --- a/debian/x2gobroker-agent.postrm +++ b/debian/x2gobroker-agent.postrm @@ -18,11 +18,17 @@ set -e case "$1" in purge) + if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent 1>/dev/null; then dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent fi - if [ ! -d /usr/share/doc/x2gobroker-daemon ]; then + if [ ! -d /usr/share/doc/x2gobroker-daemon ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then + + if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker + fi + # remove user/group x2gobroker from system (if not in use by x2gobroker-daemon getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-cgi.install b/debian/x2gobroker-cgi.install deleted file mode 100644 index e69de29..0000000 diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm index 34a8687..a1e2845 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-daemon.postrm @@ -19,11 +19,12 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then - dpkg-statoverride --remove /var/log/x2gobroker - fi + if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-wsgi ]; then + + if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker + fi - if [ ! -d /usr/share/doc/x2gobroker-agent ]; then # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/debian/x2gobroker-wsgi.install b/debian/x2gobroker-wsgi.install new file mode 100644 index 0000000..d85d699 --- /dev/null +++ b/debian/x2gobroker-wsgi.install @@ -0,0 +1 @@ +etc/x2gobroker-apache.conf /etc/x2go/ \ No newline at end of file diff --git a/debian/x2gobroker-wsgi.links b/debian/x2gobroker-wsgi.links new file mode 100644 index 0000000..99e592a --- /dev/null +++ b/debian/x2gobroker-wsgi.links @@ -0,0 +1 @@ +/etc/x2go/x2gobroker-wsgi.apache.conf /etc/apache2/conf.d/x2gobroker-wsgi \ No newline at end of file diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-wsgi.postinst similarity index 100% copy from debian/x2gobroker-daemon.postinst copy to debian/x2gobroker-wsgi.postinst diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-wsgi.postrm similarity index 84% copy from debian/x2gobroker-daemon.postrm copy to debian/x2gobroker-wsgi.postrm index 34a8687..006022f 100755 --- a/debian/x2gobroker-daemon.postrm +++ b/debian/x2gobroker-wsgi.postrm @@ -19,11 +19,12 @@ set -e case "$1" in purge) - if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then - dpkg-statoverride --remove /var/log/x2gobroker - fi + if [ ! -d /usr/share/doc/x2gobroker-agent ] && [ ! -d /usr/share/doc/x2gobroker-daemon ]; then + + if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then + dpkg-statoverride --remove /var/log/x2gobroker + fi - if [ ! -d /usr/share/doc/x2gobroker-agent ]; then # remove user/group x2gobroker from system (only if not in use by x2gobroker-agent getent passwd x2gobroker 1>/dev/null && deluser x2gobroker getent group x2gobroker 1>/dev/null && delgroup x2gobroker diff --git a/etc/x2gobroker-wsgi.apache.conf b/etc/x2gobroker-wsgi.apache.conf new file mode 100644 index 0000000..92c432f --- /dev/null +++ b/etc/x2gobroker-wsgi.apache.conf @@ -0,0 +1,43 @@ +# 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 + +# 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 /x2gobroker /usr/sbin/x2gobroker +WSGIProcessGroup x2gobroker + +<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 +</Directory> diff --git a/sbin/x2gobroker b/sbin/x2gobroker index 3951539..a092172 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -27,9 +27,6 @@ import argparse import socket import logging import thread -import tornado.web -import tornado.httpserver -import tornado.ioloop try: import x2gobroker.defaults @@ -124,10 +121,13 @@ urls = ( ('/plain/(.*)', x2gobroker.web.plain.X2GoBrokerWeb,), settings = { 'log_function': tornado_log_request, } -application = tornado.web.Application(urls, **settings) # run the web.py standalone daemon... if __name__ == "__main__": + import tornado.web + import tornado.httpserver + import tornado.ioloop + application = tornado.web.Application(urls, **settings) try: if x2gobroker.defaults.X2GOBROKER_SSL_CERTFILE and x2gobroker.defaults.X2GOBROKER_SSL_KEYFILE: # switch on https:// mode @@ -144,3 +144,21 @@ if __name__ == "__main__": tornado.ioloop.IOLoop.instance().start() except socket.error, e: print (e) +else: + import tornado.wsgi + import wsgilog + _tornado_application = tornado.wsgi.WSGIApplication(urls, **settings) + + def _application(environ, start_response): + + # some WSGI implementations do not like the SCRIPT_NAME env var + if 'SCRIPT_NAME' in environ: + del environ['SCRIPT_NAME'] + + # make sure the httpd server's environment is set as os.environ + os.environ = environ + reload(x2gobroker.defaults) + + return _tornado_application(environ, start_response) + + application = wsgilog.WsgiLog(_application, tohtml=True, tofile=True, tostream=False, toprint=False, file='/var/log/x2gobroker/wsgi.log', ) 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).

1 0

page changed: events:start
by wiki-admin＠x2go.org 09 Apr '13

09 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/09 12:05 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.115.69.222 Hostname : 46.115.69.222 Old Revision: http://wiki.x2go.org/doku.php/events:start?rev=1362907056 New Revision: http://wiki.x2go.org/doku.php/events:start Edit Summary: User : sunweaver @@ -5,9 +5,9 @@ ==== Linuxtag 2013 ==== * 4 People as booth team needed (May 22nd till 25th) ==== Google Summer or Code 2013 ==== - * [[events:gsoc2013|Read more...]] + * The X2Go Project did not get accepted for GSOC2013 ---- ===== Upcoming Workshops / Trainings ===== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: sidebar
by wiki-admin＠x2go.org 09 Apr '13

09 Apr '13

1 0

page changed: events:gsoc2013
by wiki-admin＠x2go.org 09 Apr '13

09 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/09 09:57 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.115.68.1 Hostname : 46.115.68.1 Old Revision: http://wiki.x2go.org/doku.php/events:gsoc2013?rev=1364504559 New Revision: http://wiki.x2go.org/doku.php/events:gsoc2013 Edit Summary: User : sunweaver @@ -1,101 +1,4 @@ ====== Google Summer of Code 2013 ====== - ===== Contact Information for Applying Students ===== - - * Mail(inglist): [[x2go-dev(a)lists.berlios.de]] (list language is English) - * IRC: Channel #x2go on ''irc.freenode.net'' - * Contact persons: Heinz-Markus Graesing (IRC: ''h1'') and Mike Gabriel (IRC: ''sunweaver'') - - ===== Information about this year's event ===== - * [[http://www.google-melange.com/gsoc/homepage/google/gsoc2013|Initial Informations about the event]] - * [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2013/he… does a mentoring organization apply?]] - * [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2013/he… about this years GSOC]] - * [[https://groups.google.com/forum/?fromgroups#!forum/google-summer-of-code-di… Group - Discussion about GSOC]] - * [[http://code.google.com/p/google-summer-of-code/wiki/WikiStart|GSOC Program Wiki]] - * [[http://code.google.com/p/google-summer-of-code/wiki/AdviceforMentors|Advice for GSOC Mentors]] - - ===== Schedule ===== - * March 18 19:00 UTC -- Mentoring organizations can begin submitting applications to Google - * March 29 19:00 UTC -- Mentoring organization application deadline - * April 08 19:00 UTC -- Google announces the list of accepted mentoring organizations - * April 22 19:00 UTC -- Students can start handing in their code project proposals - * May 3 19:00 UTC -- Student code projects proposal deadline - * May 06 -- Mentoring organizations should have requested slots in Google Summer of Code 2013 site at this point - * May 08 -- Slot allocations published to mentoring organizations - * May 22 -- First round of de-duplication checks happens; organizations work together to try to resolve as many duplicates as possible - * May 24 -- Student acceptance choice deadline, initial IRC meeting, sorting out duplicate acceptances of students, mentors must be assigned to students - * May 27 19:00 UTC --Accepted student proposals announced on the Google Summer of Code 2013 site - - Futher timeline information can be found [[http://www.google-melange.com/document/show/gsoc_program/google/gsoc2013/he…]] - ===== Application of X2Go Project for GSOC2013 ===== - - Our application draft can be viewed/edited on [[events:gsoc2013-application|this extra page]]. - - ===== X2Go related code projects that could be submitted to GSOC 2013 ===== - - Below you find a list of code projects that we (X2Go upstream) are interested in. Most of the projects we have on our todo lists, anyway, but there are always other things that sneak in as more important. Getting help by some genuine people on the code projects listed below would be really awesome. - - However, if you do not sense affinity to any of the project ideas listed below, feel free to propose your own code project idea. - - ==== X2Go Client / X2Go Plugin on Chromebooks ==== - * As [[http://en.wikipedia.org/wiki/Chromebook|Chromebooks]] are a kind "Thin Client" "look-alikes", it would be a good idea to be able to access Linux machines via X2Go. - * As it is only possible to install applications on chromeOS (running on an original chromebook) via the [[https://chrome.google.com/webstore/category/home|Googles webstore]] of Google Chrome, X2Go Client needs to packaged for [[https://chrome.google.com/webstore/category/home|Googles webstore]]. Preferences and maybe session files should be altered and committed, so that users can sync them with their Google account. - - ==== Access X2Go Server Sessions via HTML5 Client ==== - * It's difficult for the X2Go Project to offer clients on a number of mobile devices lacking an X.Org server and with rules that make it very difficult to submit GPL'ed software to their ecosystems. - * An HTML5 Client could help to build native apps and render sessions on a [[https://en.wikipedia.org/wiki/Canvas_element|HTML5 Canvas]] - * In the first step, it would be possible to use existing vnc<->canvas proxies like [[http://kanaka.github.com/noVNC/|noVNC]] or [[http://guac-dev.org/|Guacamole]] - - ==== Upgrade GLX extension in NX (redistributed) ==== - * With Ubuntu 12.10, Canonical has dropped Unity-2d support - * Starting with Ubuntu 12.10, Unity requires a modern Xserver with GLX v8 included - * The weakness of X2Go definitely is the NX Xserver used for display server session on the client - * This coding project would be a start to gradually update the Xserver extensions shipped with NX - * During this project you will get a deep insight into Xserver code. You need good C and Cplusplus skills to start this code project. You have to be a magician with C coding debugging tools!!! - - ==== X2Go Desktop Applet ==== - * Status quo: for several desktop the X2Go project offers a desktop integration (=binding) package - * One that can be used as a template and reference is the package: plasma-widget-x2go. It provides a Plasma widget that can dock into KDE4's panel and this widget then gives you control over your X2Go session - * Unfortunately, the Plasma X2Go widget is for KDE4 only and of no use to users GNOME, Unity, XFCE, etc. - * The idea: create a desktop independent applet that docks into the systems systray (or into the appindicator area). This applet then gives you control over your X2Go session from inside the X2Go session: unmount client-side folder, manage print job, suspend X2Go session, grant permission for desktop sharing, etc. - * Please use the tools ''plasma-widget-x2go'' and ''x2godesktopsharing'' as reference and as a start point - * Implementation shall be in C++ using Qt4. - - ==== X2Go Session Broker WebGUI Service ==== - - * Similar to Canonical's [[https://uccs.landscape.canonical.com/|UCCS Service]] X2Go admins may want to provide a company-wide site where users of the infrastructure shall be able to configure their favourite (X2Go, RDP) servers in the company's network - * This will need an extension of the X2Go Session Broker: - * Add a session profile storage (on a per-user basis) based on e.g. MongoDB - * Make these session profiles configurable through a nice WebGUI - * The current public implementation of the X2Go Session Broker is written in Python. The difficulty is medium. Interests in Web2.0 development strategies is of advantage. - - ==== JSON based protocol for communication between X2Go Client and X2Go Session Broker ==== - - * JSON is a very appropriate data format when two applications what to exchange data objects via text base communication streams - * Currently, X2Go Client and X2Go Session Broker currently communicate over a plain text base communication protocol. This protocol is not very tolerant about errors - * To make the client<->broker communication more robust, this shall be changed to X2Go Client - * However, transparent backward compatibility must be granted at the same time: new X2Go Clients must continue to be able to speak the older broker protocol, new X2Go Session Brokers must be able to understand old X2Go Clients - * Good knowledge of Qt4 and Cplusplus are required for this task - - - ==== PyHoca-PubAppDaemon - transparent X2Go Published Applications Integration into local Desktops ==== - - * This idea focuses on X2Go integration into Unity desktops (for providing hybrid fat/thin clients) - * All multimedia intensive applications are run locally (using server-side dot files in a server-side home directory) - * Anything else runs on an X2Go terminal server - * The desktop shell's task is to merge both application types transparently with another - - * X2Go offers a feature called X2Go Published Applications - * The feature allows starting of X2Go sessions of the type PUBLISHED on remote application servers. This session merely returns an application menu tree (and a slumbering x2goagent). Currently this menu tree is rendered by X2Go Client / PyHoca-GUI as a submenu of their systray icon. From this menu tree you then can select individual applications to get launched within your local desktop shell - * However, how would it be if one could smoothly merge the remote menu tree into the local desktops application menu? - * Or even more, drag'n'drop icons from the local desktop's menu tree onto the local desktop? - * Or even better, dock those applications to Unity's Launcher? - * An approach to realize this would be a split up of PyHoca-GUI: PyHoca-PubAppTrigger and PyHoca-PubAppDaemon. - * On remote login (LightDM) a guest (Ubuntu) session gets launched and in the background PyHoca-PubAppDaemon waits for commands via a Unix domain socket file - * PyHoca-PubAppDaemon can be queried for server-side provided applications (a list of .desktop files plus base64 encoded icons) - * The returned menu items are merged into the local application menu - * A click on one of those (local) .desktop files (executing a published application) will launch PyHoca-PubAppTrigger. This trigger talks to the PyHoca-PubAppDaemon and initiates the launch of the requested server-side application (via the X2Go Published Applications feature) - - The task is rather complex and demands quite a bit of understanding of the FreeDesktop.org specifications. The whole project will be in Python. A draft for the login process is already available on [[http://git.x2go.org|X2Go Git]] (projects: ''lightdm-remote-login-x2go'' and ''libpam-x2go''). - + This year (GSOC2013), the X2Go Project got rejected by Google. We will re-apply in 2014. -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: wiki:development:new-feature-brainstorming
by wiki-admin＠x2go.org 09 Apr '13

09 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/09 09:56 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.115.68.1 Hostname : 46.115.68.1 Old Revision: http://wiki.x2go.org/doku.php/wiki:development:new-feature-brainstorming?re… New Revision: http://wiki.x2go.org/doku.php/wiki:development:new-feature-brainstorming Edit Summary: User : sunweaver @@ -1,33 +1,41 @@ - ===== X2Go related code projects that could be submitted to GSOC 2013 ===== + ====== New features for X2Go ====== - Below you find a list of code projects that we (X2Go upstream) are interested in. Most of the projects we have on our todo lists, anyway, but there are always other things that sneak in as more important. Getting help by some genuine people on the code projects listed below would be really awesome. + Below you find a list of new code projects that we are interested in, but noone has started working on them, yet. - However, if you do not sense affinity to any of the project ideas listed below, feel free to propose your own code project idea. + ===== X2Go Client ===== ==== X2Go Client / X2Go Plugin on Chromebooks ==== * As [[http://en.wikipedia.org/wiki/Chromebook|Chromebooks]] are a kind "Thin Client" "look-alikes", it would be a good idea to be able to access Linux machines via X2Go. * As it is only possible to install applications on chromeOS (running on an original chromebook) via the [[https://chrome.google.com/webstore/category/home|Googles webstore]] of Google Chrome, X2Go Client needs to packaged for [[https://chrome.google.com/webstore/category/home|Googles webstore]]. Preferences and maybe session files should be altered and committed, so that users can sync them with their Google account. + + ===== X2Go Server ====== ==== Access X2Go Server Sessions via HTML5 Client ==== * It's difficult for the X2Go Project to offer clients on a number of mobile devices lacking an X.Org server and with rules that make it very difficult to submit GPL'ed software to their ecosystems. * An HTML5 Client could help to build native apps and render sessions on a [[https://en.wikipedia.org/wiki/Canvas_element|HTML5 Canvas]] * In the first step, it would be possible to use existing vnc<->canvas proxies like [[http://kanaka.github.com/noVNC/|noVNC]] or [[http://guac-dev.org/|Guacamole]] + + ===== NX-Libs ===== ==== Upgrade GLX extension in NX (redistributed) ==== * With Ubuntu 12.10, Canonical has dropped Unity-2d support * Starting with Ubuntu 12.10, Unity requires a modern Xserver with GLX v8 included * The weakness of X2Go definitely is the NX Xserver used for display server session on the client * This coding project would be a start to gradually update the Xserver extensions shipped with NX * During this project you will get a deep insight into Xserver code. You need good C and Cplusplus skills to start this code project. You have to be a magician with C coding debugging tools!!! + + ===== Desktop Bindings ===== ==== X2Go Desktop Applet ==== * Status quo: for several desktop the X2Go project offers a desktop integration (=binding) package * One that can be used as a template and reference is the package: plasma-widget-x2go. It provides a Plasma widget that can dock into KDE4's panel and this widget then gives you control over your X2Go session * Unfortunately, the Plasma X2Go widget is for KDE4 only and of no use to users GNOME, Unity, XFCE, etc. * The idea: create a desktop independent applet that docks into the systems systray (or into the appindicator area). This applet then gives you control over your X2Go session from inside the X2Go session: unmount client-side folder, manage print job, suspend X2Go session, grant permission for desktop sharing, etc. * Please use the tools ''plasma-widget-x2go'' and ''x2godesktopsharing'' as reference and as a start point * Implementation shall be in C++ using Qt4. + + ===== X2Go Session Broker ====== ==== X2Go Session Broker WebGUI Service ==== * Similar to Canonical's [[https://uccs.landscape.canonical.com/|UCCS Service]] X2Go admins may want to provide a company-wide site where users of the infrastructure shall be able to configure their favourite (X2Go, RDP) servers in the company's network @@ -43,8 +51,10 @@ * To make the client<->broker communication more robust, this shall be changed to X2Go Client * However, transparent backward compatibility must be granted at the same time: new X2Go Clients must continue to be able to speak the older broker protocol, new X2Go Session Brokers must be able to understand old X2Go Clients * Good knowledge of Qt4 and Cplusplus are required for this task + + ===== PyHoca / Python X2Go ===== ==== PyHoca-PubAppDaemon - transparent X2Go Published Applications Integration into local Desktops ==== * This idea focuses on X2Go integration into Unity desktops (for providing hybrid fat/thin clients) -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page added: wiki:development:new-feature-brainstorming
by wiki-admin＠x2go.org 09 Apr '13

09 Apr '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/04/09 09:52 Browser : Mozilla/5.0 (X11; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0 Iceweasel/18.0.1 IP-Address : 46.115.68.1 Hostname : 46.115.68.1 Old Revision: --- New Revision: http://wiki.x2go.org/doku.php/wiki:development:new-feature-brainstorming Edit Summary: created User : sunweaver ===== X2Go related code projects that could be submitted to GSOC 2013 ===== Below you find a list of code projects that we (X2Go upstream) are interested in. Most of the projects we have on our todo lists, anyway, but there are always other things that sneak in as more important. Getting help by some genuine people on the code projects listed below would be really awesome. However, if you do not sense affinity to any of the project ideas listed below, feel free to propose your own code project idea. ==== X2Go Client / X2Go Plugin on Chromebooks ==== * As [[http://en.wikipedia.org/wiki/Chromebook|Chromebooks]] are a kind "Thin Client" "look-alikes", it would be a good idea to be able to access Linux machines via X2Go. * As it is only possible to install applications on chromeOS (running on an original chromebook) via the [[https://chrome.google.com/webstore/category/home|Googles webstore]] of Google Chrome, X2Go Client needs to packaged for [[https://chrome.google.com/webstore/category/home|Googles webstore]]. Preferences and maybe session files should be altered and committed, so that users can sync them with their Google account. ==== Access X2Go Server Sessions via HTML5 Client ==== * It's difficult for the X2Go Project to offer clients on a number of mobile devices lacking an X.Org server and with rules that make it very difficult to submit GPL'ed software to their ecosystems. * An HTML5 Client could help to build native apps and render sessions on a [[https://en.wikipedia.org/wiki/Canvas_element|HTML5 Canvas]] * In the first step, it would be possible to use existing vnc<->canvas proxies like [[http://kanaka.github.com/noVNC/|noVNC]] or [[http://guac-dev.org/|Guacamole]] ==== Upgrade GLX extension in NX (redistributed) ==== * With Ubuntu 12.10, Canonical has dropped Unity-2d support * Starting with Ubuntu 12.10, Unity requires a modern Xserver with GLX v8 included * The weakness of X2Go definitely is the NX Xserver used for display server session on the client * This coding project would be a start to gradually update the Xserver extensions shipped with NX * During this project you will get a deep insight into Xserver code. You need good C and Cplusplus skills to start this code project. You have to be a magician with C coding debugging tools!!! ==== X2Go Desktop Applet ==== * Status quo: for several desktop the X2Go project offers a desktop integration (=binding) package * One that can be used as a template and reference is the package: plasma-widget-x2go. It provides a Plasma widget that can dock into KDE4's panel and this widget then gives you control over your X2Go session * Unfortunately, the Plasma X2Go widget is for KDE4 only and of no use to users GNOME, Unity, XFCE, etc. * The idea: create a desktop independent applet that docks into the systems systray (or into the appindicator area). This applet then gives you control over your X2Go session from inside the X2Go session: unmount client-side folder, manage print job, suspend X2Go session, grant permission for desktop sharing, etc. * Please use the tools ''plasma-widget-x2go'' and ''x2godesktopsharing'' as reference and as a start point * Implementation shall be in C++ using Qt4. ==== X2Go Session Broker WebGUI Service ==== * Similar to Canonical's [[https://uccs.landscape.canonical.com/|UCCS Service]] X2Go admins may want to provide a company-wide site where users of the infrastructure shall be able to configure their favourite (X2Go, RDP) servers in the company's network * This will need an extension of the X2Go Session Broker: * Add a session profile storage (on a per-user basis) based on e.g. MongoDB * Make these session profiles configurable through a nice WebGUI * The current public implementation of the X2Go Session Broker is written in Python. The difficulty is medium. Interests in Web2.0 development strategies is of advantage. ==== JSON based protocol for communication between X2Go Client and X2Go Session Broker ==== * JSON is a very appropriate data format when two applications what to exchange data objects via text base communication streams * Currently, X2Go Client and X2Go Session Broker currently communicate over a plain text base communication protocol. This protocol is not very tolerant about errors * To make the client<->broker communication more robust, this shall be changed to X2Go Client * However, transparent backward compatibility must be granted at the same time: new X2Go Clients must continue to be able to speak the older broker protocol, new X2Go Session Brokers must be able to understand old X2Go Clients * Good knowledge of Qt4 and Cplusplus are required for this task ==== PyHoca-PubAppDaemon - transparent X2Go Published Applications Integration into local Desktops ==== * This idea focuses on X2Go integration into Unity desktops (for providing hybrid fat/thin clients) * All multimedia intensive applications are run locally (using server-side dot files in a server-side home directory) * Anything else runs on an X2Go terminal server * The desktop shell's task is to merge both application types transparently with another * X2Go offers a feature called X2Go Published Applications * The feature allows starting of X2Go sessions of the type PUBLISHED on remote application servers. This session merely returns an application menu tree (and a slumbering x2goagent). Currently this menu tree is rendered by X2Go Client / PyHoca-GUI as a submenu of their systray icon. From this menu tree you then can select individual applications to get launched within your local desktop shell * However, how would it be if one could smoothly merge the remote menu tree into the local desktops application menu? * Or even more, drag'n'drop icons from the local desktop's menu tree onto the local desktop? * Or even better, dock those applications to Unity's Launcher? * An approach to realize this would be a split up of PyHoca-GUI: PyHoca-PubAppTrigger and PyHoca-PubAppDaemon. * On remote login (LightDM) a guest (Ubuntu) session gets launched and in the background PyHoca-PubAppDaemon waits for commands via a Unix domain socket file * PyHoca-PubAppDaemon can be queried for server-side provided applications (a list of .desktop files plus base64 encoded icons) * The returned menu items are merged into the local application menu * A click on one of those (local) .desktop files (executing a published application) will launch PyHoca-PubAppTrigger. This trigger talks to the PyHoca-PubAppDaemon and initiates the launch of the requested server-side application (via the X2Go Published Applications feature) The task is rather complex and demands quite a bit of understanding of the FreeDesktop.org specifications. The whole project will be in Python. A draft for the login process is already available on [[http://git.x2go.org|X2Go Git]] (projects: ''lightdm-remote-login-x2go'' and ''libpam-x2go''). -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:sponsors
by wiki-admin＠x2go.org 09 Apr '13

09 Apr '13

1 0

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.0-20-gfb53bd9
by git-admin＠x2go.org 08 Apr '13

08 Apr '13

The branch, release/4.0.0.x has been updated via fb53bd9d0133a821a410e716d186a6b5c728fd29 (commit) from 98fa38c879da3ee1663f8d076163ff365adb63bd (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 ----------------------------------------------------------------- commit fb53bd9d0133a821a410e716d186a6b5c728fd29 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Apr 8 22:38:11 2013 +0200 /debian/control: + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: #163). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ debian/control | 2 ++ 2 files changed, 7 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 654403a..72a4f4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,11 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.0.2): - Use x2gopath in Perl scripts to set the lib path. (Fixes: #103). + [ Mike Gabriel ] + /debian/control: + + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: + #163). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100 x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index f242c27..44f3789 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,8 @@ Recommends: x11-xfs-utils, x11-xkb-utils, x11-xserver-utils, + xfonts-base, + fontconfig, xinit, x2goserver-extensions (= ${source:Version}) Suggests: hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits