This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit c9696c3db8ba843b2fe95d4a652c0e54147213e0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 7 08:36:27 2018 +0200 Getting started documentation: Rework document, convert to markdown, install into x2gobroker bin:pkg (on DEB based systems). --- debian/changelog | 2 ++ debian/x2gobroker.docs | 1 + .../README.x2goclient+broker.getting-started.md | 39 ++++++++++++++-------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ee8a6f..e203a54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,6 +71,8 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium and session profile defaults. - etc/x2gobroker-wsgi.apache.*: Drop Apache2.2 support. - Log to system broker.log file when run via x2gobroker-ssh. + - Getting started documentation: Rework document, convert to markdown, + install into x2gobroker bin:pkg (on DEB based systems). * debian/*: + Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic. diff --git a/debian/x2gobroker.docs b/debian/x2gobroker.docs new file mode 100644 index 0000000..1c04808 --- /dev/null +++ b/debian/x2gobroker.docs @@ -0,0 +1 @@ +doc/README.x2goclient+broker.getting-started \ No newline at end of file diff --git a/doc/README.x2goclient+broker.getting-started b/docs/README.x2goclient+broker.getting-started.md similarity index 70% rename from doc/README.x2goclient+broker.getting-started rename to docs/README.x2goclient+broker.getting-started.md index bececee..dac2f23 100644 --- a/doc/README.x2goclient+broker.getting-started +++ b/docs/README.x2goclient+broker.getting-started.md @@ -1,18 +1,23 @@ -X2Go Client / X2Go Broker Setup -=============================== +# X2Go Client / X2Go Broker Setup The easy setup for getting a first impression is this: -1. -Install x2goclient, x2gobroker and x2goserver(-xsession) locally +## Installing X2Go Client, X2Go Server and X2Go Broker - $ sudo apt-get install x2gobroker-daemon x2gobroker-authservice - $ sudo apt-get install x2goclient - $ sudo apt-get install x2goserver-xsession +Install x2goclient, x2gobroker and x2goserver(-xsession) locally. For +testing purposes, you can run all three components on one host. For +production environments, you distribute the services over different +machines and probably run many X2Go Server instances and man X2Go Client +instances. -2. -Edit the file /etc/default/x2gobroker-daemon. Enable the daemon and + $ sudo apt install x2gobroker-daemon x2gobroker-authservice + $ sudo apt install x2goclient + $ sudo apt install x2goserver-xsession + +## Test Configuration + +Edit the file /etc/default/x2gobroker-daemon. Enable the daemon and, if needed, adapt the bind address:port (DAEMON_BIND_ADDRESS) parameter. After editing, save the file and return to your terminal command line. @@ -20,21 +25,25 @@ From here, start the daemon: $ invoke-rc.d x2gobroker-daemon restart -3.1 +## Approach 1: Launch X2Go Client + Launch x2goclient in HTTP broker mode: $ x2goclient --broker-url=http://127.0.0.1:8080/plain/ (if you have changed the bind address, use your changed value here). -3.2 +## Approach 2: Launch PyHoca-GUI + Alternatively, launch pyhoca-gui in HTTP broker mode: $ pyhoca-gui --broker-url=https://127.0.0.1:8080/json/ (if you have changed the bind address, use your changed value here). -4. + +## The Broker Authentication + The first authentication that the x2goclient asks for is an authentication against the X2Go Broker (a HTTP server using the Tornado web framework on default port 8080). @@ -44,14 +53,16 @@ further by looking at this file: $ sudo editor /etc/pam.d/x2gobroker -5. +## The X2Go Client WebUI in Broker Mode + If you have successfully authenticated against the broker, then you get offered two session profiles named ,,KDE - localhost'' and ,,MATE - localhost''. These session profiles can be modified and customized in /etc/x2go/broker/x2gobroker-sessionprofiles.conf -6. +## Launch an X2Go Session via Broker Backend + If you select either of the session profiles (KDE or MATE on localhost), you will start an X2Go session on your local machine. (Of course, either KDE or the MATE desktop needs to be installed locally). -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 24873e71ce1f6b029d5d7474580d6887c086b897 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 7 08:41:34 2018 +0200 docs/source: Initialize Sphinx API documentation's .rst files. --- debian/changelog | 1 + docs/source/modules.rst | 7 ++++ docs/source/x2gobroker.agent.rst | 7 ++++ docs/source/x2gobroker.authmechs.base_authmech.rst | 7 ++++ .../x2gobroker.authmechs.https_get_authmech.rst | 7 ++++ docs/source/x2gobroker.authmechs.none_authmech.rst | 7 ++++ docs/source/x2gobroker.authmechs.pam_authmech.rst | 7 ++++ docs/source/x2gobroker.authmechs.rst | 21 ++++++++++++ .../x2gobroker.authmechs.testsuite_authmech.rst | 7 ++++ docs/source/x2gobroker.authservice.rst | 7 ++++ docs/source/x2gobroker.basicauth.rst | 7 ++++ docs/source/x2gobroker.brokers.base_broker.rst | 7 ++++ docs/source/x2gobroker.brokers.inifile_broker.rst | 7 ++++ docs/source/x2gobroker.brokers.rst | 19 +++++++++++ docs/source/x2gobroker.brokers.zeroconf_broker.rst | 7 ++++ docs/source/x2gobroker.client.plain.rst | 7 ++++ docs/source/x2gobroker.client.rst | 17 ++++++++++ docs/source/x2gobroker.config.rst | 7 ++++ docs/source/x2gobroker.defaults.rst | 7 ++++ docs/source/x2gobroker.loadchecker.rst | 7 ++++ docs/source/x2gobroker.loggers.rst | 7 ++++ .../x2gobroker.nameservices.base_nameservice.rst | 7 ++++ .../x2gobroker.nameservices.libnss_nameservice.rst | 7 ++++ docs/source/x2gobroker.nameservices.rst | 19 +++++++++++ ...gobroker.nameservices.testsuite_nameservice.rst | 7 ++++ .../x2gobroker.optional_scripts.base_script.rst | 7 ++++ docs/source/x2gobroker.optional_scripts.rst | 17 ++++++++++ docs/source/x2gobroker.rst | 39 ++++++++++++++++++++++ docs/source/x2gobroker.tests.rst | 27 +++++++++++++++ docs/source/x2gobroker.tests.runalltests.rst | 7 ++++ docs/source/x2gobroker.tests.test_broker_agent.rst | 7 ++++ docs/source/x2gobroker.tests.test_broker_base.rst | 7 ++++ .../x2gobroker.tests.test_broker_inifile.rst | 7 ++++ .../x2gobroker.tests.test_broker_zeroconf.rst | 7 ++++ .../x2gobroker.tests.test_client_plain_base.rst | 7 ++++ docs/source/x2gobroker.tests.test_utils.rst | 7 ++++ .../x2gobroker.tests.test_web_plain_base.rst | 7 ++++ .../x2gobroker.tests.test_web_plain_inifile.rst | 7 ++++ .../x2gobroker.tests.test_web_plain_zeroconf.rst | 7 ++++ .../x2gobroker.tests.test_web_uccs_zeroconf.rst | 7 ++++ docs/source/x2gobroker.uccsjson.rst | 7 ++++ docs/source/x2gobroker.utils.rst | 7 ++++ docs/source/x2gobroker.web.extras.rst | 7 ++++ docs/source/x2gobroker.web.json.rst | 7 ++++ docs/source/x2gobroker.web.plain.rst | 7 ++++ docs/source/x2gobroker.web.rst | 20 +++++++++++ docs/source/x2gobroker.web.uccs.rst | 7 ++++ docs/source/x2gobroker.x2gobroker_exceptions.rst | 7 ++++ 48 files changed, 453 insertions(+) diff --git a/debian/changelog b/debian/changelog index d337cd7..fc33189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium - Getting started documentation: Rework document, convert to markdown, install into x2gobroker bin:pkg (on DEB based systems). - Makefile.docupload: Add apidoc target (running sphinx-apidoc). + - docs/source: Initialize Sphinx API documentation's .rst files. * debian/*: + Trigger Makefile's install target and install those files. Drop debhelper from-source-installation magic. diff --git a/docs/source/modules.rst b/docs/source/modules.rst new file mode 100644 index 0000000..c8c1eb7 --- /dev/null +++ b/docs/source/modules.rst @@ -0,0 +1,7 @@ +x2gobroker +========== + +.. toctree:: + :maxdepth: 4 + + x2gobroker diff --git a/docs/source/x2gobroker.agent.rst b/docs/source/x2gobroker.agent.rst new file mode 100644 index 0000000..c193824 --- /dev/null +++ b/docs/source/x2gobroker.agent.rst @@ -0,0 +1,7 @@ +x2gobroker.agent module +======================= + +.. automodule:: x2gobroker.agent + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.authmechs.base_authmech.rst b/docs/source/x2gobroker.authmechs.base_authmech.rst new file mode 100644 index 0000000..172845d --- /dev/null +++ b/docs/source/x2gobroker.authmechs.base_authmech.rst @@ -0,0 +1,7 @@ +x2gobroker.authmechs.base_authmech module +========================================= + +.. automodule:: x2gobroker.authmechs.base_authmech + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.authmechs.https_get_authmech.rst b/docs/source/x2gobroker.authmechs.https_get_authmech.rst new file mode 100644 index 0000000..d4cf443 --- /dev/null +++ b/docs/source/x2gobroker.authmechs.https_get_authmech.rst @@ -0,0 +1,7 @@ +x2gobroker.authmechs.https_get_authmech module +============================================== + +.. automodule:: x2gobroker.authmechs.https_get_authmech + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.authmechs.none_authmech.rst b/docs/source/x2gobroker.authmechs.none_authmech.rst new file mode 100644 index 0000000..d222dd4 --- /dev/null +++ b/docs/source/x2gobroker.authmechs.none_authmech.rst @@ -0,0 +1,7 @@ +x2gobroker.authmechs.none_authmech module +========================================= + +.. automodule:: x2gobroker.authmechs.none_authmech + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.authmechs.pam_authmech.rst b/docs/source/x2gobroker.authmechs.pam_authmech.rst new file mode 100644 index 0000000..ea0f8b2 --- /dev/null +++ b/docs/source/x2gobroker.authmechs.pam_authmech.rst @@ -0,0 +1,7 @@ +x2gobroker.authmechs.pam_authmech module +======================================== + +.. automodule:: x2gobroker.authmechs.pam_authmech + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.authmechs.rst b/docs/source/x2gobroker.authmechs.rst new file mode 100644 index 0000000..23ec664 --- /dev/null +++ b/docs/source/x2gobroker.authmechs.rst @@ -0,0 +1,21 @@ +x2gobroker.authmechs package +============================ + +Submodules +---------- + +.. toctree:: + + x2gobroker.authmechs.base_authmech + x2gobroker.authmechs.https_get_authmech + x2gobroker.authmechs.none_authmech + x2gobroker.authmechs.pam_authmech + x2gobroker.authmechs.testsuite_authmech + +Module contents +--------------- + +.. automodule:: x2gobroker.authmechs + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.authmechs.testsuite_authmech.rst b/docs/source/x2gobroker.authmechs.testsuite_authmech.rst new file mode 100644 index 0000000..64b30f1 --- /dev/null +++ b/docs/source/x2gobroker.authmechs.testsuite_authmech.rst @@ -0,0 +1,7 @@ +x2gobroker.authmechs.testsuite_authmech module +============================================== + +.. automodule:: x2gobroker.authmechs.testsuite_authmech + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.authservice.rst b/docs/source/x2gobroker.authservice.rst new file mode 100644 index 0000000..f45fb60 --- /dev/null +++ b/docs/source/x2gobroker.authservice.rst @@ -0,0 +1,7 @@ +x2gobroker.authservice module +============================= + +.. automodule:: x2gobroker.authservice + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.basicauth.rst b/docs/source/x2gobroker.basicauth.rst new file mode 100644 index 0000000..2e72ffa --- /dev/null +++ b/docs/source/x2gobroker.basicauth.rst @@ -0,0 +1,7 @@ +x2gobroker.basicauth module +=========================== + +.. automodule:: x2gobroker.basicauth + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.brokers.base_broker.rst b/docs/source/x2gobroker.brokers.base_broker.rst new file mode 100644 index 0000000..c0de837 --- /dev/null +++ b/docs/source/x2gobroker.brokers.base_broker.rst @@ -0,0 +1,7 @@ +x2gobroker.brokers.base_broker module +===================================== + +.. automodule:: x2gobroker.brokers.base_broker + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.brokers.inifile_broker.rst b/docs/source/x2gobroker.brokers.inifile_broker.rst new file mode 100644 index 0000000..7bc937d --- /dev/null +++ b/docs/source/x2gobroker.brokers.inifile_broker.rst @@ -0,0 +1,7 @@ +x2gobroker.brokers.inifile_broker module +======================================== + +.. automodule:: x2gobroker.brokers.inifile_broker + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.brokers.rst b/docs/source/x2gobroker.brokers.rst new file mode 100644 index 0000000..365f108 --- /dev/null +++ b/docs/source/x2gobroker.brokers.rst @@ -0,0 +1,19 @@ +x2gobroker.brokers package +========================== + +Submodules +---------- + +.. toctree:: + + x2gobroker.brokers.base_broker + x2gobroker.brokers.inifile_broker + x2gobroker.brokers.zeroconf_broker + +Module contents +--------------- + +.. automodule:: x2gobroker.brokers + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.brokers.zeroconf_broker.rst b/docs/source/x2gobroker.brokers.zeroconf_broker.rst new file mode 100644 index 0000000..6016ba8 --- /dev/null +++ b/docs/source/x2gobroker.brokers.zeroconf_broker.rst @@ -0,0 +1,7 @@ +x2gobroker.brokers.zeroconf_broker module +========================================= + +.. automodule:: x2gobroker.brokers.zeroconf_broker + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.client.plain.rst b/docs/source/x2gobroker.client.plain.rst new file mode 100644 index 0000000..60cb0ad --- /dev/null +++ b/docs/source/x2gobroker.client.plain.rst @@ -0,0 +1,7 @@ +x2gobroker.client.plain module +============================== + +.. automodule:: x2gobroker.client.plain + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.client.rst b/docs/source/x2gobroker.client.rst new file mode 100644 index 0000000..0bb958e --- /dev/null +++ b/docs/source/x2gobroker.client.rst @@ -0,0 +1,17 @@ +x2gobroker.client package +========================= + +Submodules +---------- + +.. toctree:: + + x2gobroker.client.plain + +Module contents +--------------- + +.. automodule:: x2gobroker.client + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.config.rst b/docs/source/x2gobroker.config.rst new file mode 100644 index 0000000..b58d013 --- /dev/null +++ b/docs/source/x2gobroker.config.rst @@ -0,0 +1,7 @@ +x2gobroker.config module +======================== + +.. automodule:: x2gobroker.config + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.defaults.rst b/docs/source/x2gobroker.defaults.rst new file mode 100644 index 0000000..e644b46 --- /dev/null +++ b/docs/source/x2gobroker.defaults.rst @@ -0,0 +1,7 @@ +x2gobroker.defaults module +========================== + +.. automodule:: x2gobroker.defaults + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.loadchecker.rst b/docs/source/x2gobroker.loadchecker.rst new file mode 100644 index 0000000..a48d624 --- /dev/null +++ b/docs/source/x2gobroker.loadchecker.rst @@ -0,0 +1,7 @@ +x2gobroker.loadchecker module +============================= + +.. automodule:: x2gobroker.loadchecker + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.loggers.rst b/docs/source/x2gobroker.loggers.rst new file mode 100644 index 0000000..24698db --- /dev/null +++ b/docs/source/x2gobroker.loggers.rst @@ -0,0 +1,7 @@ +x2gobroker.loggers module +========================= + +.. automodule:: x2gobroker.loggers + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.nameservices.base_nameservice.rst b/docs/source/x2gobroker.nameservices.base_nameservice.rst new file mode 100644 index 0000000..0f44284 --- /dev/null +++ b/docs/source/x2gobroker.nameservices.base_nameservice.rst @@ -0,0 +1,7 @@ +x2gobroker.nameservices.base_nameservice module +=============================================== + +.. automodule:: x2gobroker.nameservices.base_nameservice + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.nameservices.libnss_nameservice.rst b/docs/source/x2gobroker.nameservices.libnss_nameservice.rst new file mode 100644 index 0000000..c6b7ca8 --- /dev/null +++ b/docs/source/x2gobroker.nameservices.libnss_nameservice.rst @@ -0,0 +1,7 @@ +x2gobroker.nameservices.libnss_nameservice module +================================================= + +.. automodule:: x2gobroker.nameservices.libnss_nameservice + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.nameservices.rst b/docs/source/x2gobroker.nameservices.rst new file mode 100644 index 0000000..8c5ea37 --- /dev/null +++ b/docs/source/x2gobroker.nameservices.rst @@ -0,0 +1,19 @@ +x2gobroker.nameservices package +=============================== + +Submodules +---------- + +.. toctree:: + + x2gobroker.nameservices.base_nameservice + x2gobroker.nameservices.libnss_nameservice + x2gobroker.nameservices.testsuite_nameservice + +Module contents +--------------- + +.. automodule:: x2gobroker.nameservices + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.nameservices.testsuite_nameservice.rst b/docs/source/x2gobroker.nameservices.testsuite_nameservice.rst new file mode 100644 index 0000000..4a187d3 --- /dev/null +++ b/docs/source/x2gobroker.nameservices.testsuite_nameservice.rst @@ -0,0 +1,7 @@ +x2gobroker.nameservices.testsuite_nameservice module +==================================================== + +.. automodule:: x2gobroker.nameservices.testsuite_nameservice + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.optional_scripts.base_script.rst b/docs/source/x2gobroker.optional_scripts.base_script.rst new file mode 100644 index 0000000..a6ef1c2 --- /dev/null +++ b/docs/source/x2gobroker.optional_scripts.base_script.rst @@ -0,0 +1,7 @@ +x2gobroker.optional_scripts.base_script module +============================================== + +.. automodule:: x2gobroker.optional_scripts.base_script + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.optional_scripts.rst b/docs/source/x2gobroker.optional_scripts.rst new file mode 100644 index 0000000..f4523d3 --- /dev/null +++ b/docs/source/x2gobroker.optional_scripts.rst @@ -0,0 +1,17 @@ +x2gobroker.optional_scripts package +=================================== + +Submodules +---------- + +.. toctree:: + + x2gobroker.optional_scripts.base_script + +Module contents +--------------- + +.. automodule:: x2gobroker.optional_scripts + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.rst b/docs/source/x2gobroker.rst new file mode 100644 index 0000000..c3b02b3 --- /dev/null +++ b/docs/source/x2gobroker.rst @@ -0,0 +1,39 @@ +x2gobroker package +================== + +Subpackages +----------- + +.. toctree:: + + x2gobroker.authmechs + x2gobroker.brokers + x2gobroker.client + x2gobroker.nameservices + x2gobroker.optional_scripts + x2gobroker.tests + x2gobroker.web + +Submodules +---------- + +.. toctree:: + + x2gobroker.agent + x2gobroker.authservice + x2gobroker.basicauth + x2gobroker.config + x2gobroker.defaults + x2gobroker.loadchecker + x2gobroker.loggers + x2gobroker.uccsjson + x2gobroker.utils + x2gobroker.x2gobroker_exceptions + +Module contents +--------------- + +.. automodule:: x2gobroker + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.rst b/docs/source/x2gobroker.tests.rst new file mode 100644 index 0000000..8aca2fc --- /dev/null +++ b/docs/source/x2gobroker.tests.rst @@ -0,0 +1,27 @@ +x2gobroker.tests package +======================== + +Submodules +---------- + +.. toctree:: + + x2gobroker.tests.runalltests + x2gobroker.tests.test_broker_agent + x2gobroker.tests.test_broker_base + x2gobroker.tests.test_broker_inifile + x2gobroker.tests.test_broker_zeroconf + x2gobroker.tests.test_client_plain_base + x2gobroker.tests.test_utils + x2gobroker.tests.test_web_plain_base + x2gobroker.tests.test_web_plain_inifile + x2gobroker.tests.test_web_plain_zeroconf + x2gobroker.tests.test_web_uccs_zeroconf + +Module contents +--------------- + +.. automodule:: x2gobroker.tests + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.runalltests.rst b/docs/source/x2gobroker.tests.runalltests.rst new file mode 100644 index 0000000..363ca37 --- /dev/null +++ b/docs/source/x2gobroker.tests.runalltests.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.runalltests module +=================================== + +.. automodule:: x2gobroker.tests.runalltests + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_broker_agent.rst b/docs/source/x2gobroker.tests.test_broker_agent.rst new file mode 100644 index 0000000..f3a2fff --- /dev/null +++ b/docs/source/x2gobroker.tests.test_broker_agent.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_broker_agent module +========================================= + +.. automodule:: x2gobroker.tests.test_broker_agent + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_broker_base.rst b/docs/source/x2gobroker.tests.test_broker_base.rst new file mode 100644 index 0000000..8f99c29 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_broker_base.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_broker_base module +======================================== + +.. automodule:: x2gobroker.tests.test_broker_base + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_broker_inifile.rst b/docs/source/x2gobroker.tests.test_broker_inifile.rst new file mode 100644 index 0000000..a614c27 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_broker_inifile.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_broker_inifile module +=========================================== + +.. automodule:: x2gobroker.tests.test_broker_inifile + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_broker_zeroconf.rst b/docs/source/x2gobroker.tests.test_broker_zeroconf.rst new file mode 100644 index 0000000..1cfa927 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_broker_zeroconf.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_broker_zeroconf module +============================================ + +.. automodule:: x2gobroker.tests.test_broker_zeroconf + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_client_plain_base.rst b/docs/source/x2gobroker.tests.test_client_plain_base.rst new file mode 100644 index 0000000..0b5cb33 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_client_plain_base.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_client_plain_base module +============================================== + +.. automodule:: x2gobroker.tests.test_client_plain_base + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_utils.rst b/docs/source/x2gobroker.tests.test_utils.rst new file mode 100644 index 0000000..051a9f7 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_utils.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_utils module +================================== + +.. automodule:: x2gobroker.tests.test_utils + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_web_plain_base.rst b/docs/source/x2gobroker.tests.test_web_plain_base.rst new file mode 100644 index 0000000..0cfafa3 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_web_plain_base.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_web_plain_base module +=========================================== + +.. automodule:: x2gobroker.tests.test_web_plain_base + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_web_plain_inifile.rst b/docs/source/x2gobroker.tests.test_web_plain_inifile.rst new file mode 100644 index 0000000..d7f7f60 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_web_plain_inifile.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_web_plain_inifile module +============================================== + +.. automodule:: x2gobroker.tests.test_web_plain_inifile + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_web_plain_zeroconf.rst b/docs/source/x2gobroker.tests.test_web_plain_zeroconf.rst new file mode 100644 index 0000000..6911727 --- /dev/null +++ b/docs/source/x2gobroker.tests.test_web_plain_zeroconf.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_web_plain_zeroconf module +=============================================== + +.. automodule:: x2gobroker.tests.test_web_plain_zeroconf + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.tests.test_web_uccs_zeroconf.rst b/docs/source/x2gobroker.tests.test_web_uccs_zeroconf.rst new file mode 100644 index 0000000..cdbdc0f --- /dev/null +++ b/docs/source/x2gobroker.tests.test_web_uccs_zeroconf.rst @@ -0,0 +1,7 @@ +x2gobroker.tests.test_web_uccs_zeroconf module +============================================== + +.. automodule:: x2gobroker.tests.test_web_uccs_zeroconf + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.uccsjson.rst b/docs/source/x2gobroker.uccsjson.rst new file mode 100644 index 0000000..ebbe888 --- /dev/null +++ b/docs/source/x2gobroker.uccsjson.rst @@ -0,0 +1,7 @@ +x2gobroker.uccsjson module +========================== + +.. automodule:: x2gobroker.uccsjson + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.utils.rst b/docs/source/x2gobroker.utils.rst new file mode 100644 index 0000000..41189f5 --- /dev/null +++ b/docs/source/x2gobroker.utils.rst @@ -0,0 +1,7 @@ +x2gobroker.utils module +======================= + +.. automodule:: x2gobroker.utils + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.web.extras.rst b/docs/source/x2gobroker.web.extras.rst new file mode 100644 index 0000000..2d99893 --- /dev/null +++ b/docs/source/x2gobroker.web.extras.rst @@ -0,0 +1,7 @@ +x2gobroker.web.extras module +============================ + +.. automodule:: x2gobroker.web.extras + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.web.json.rst b/docs/source/x2gobroker.web.json.rst new file mode 100644 index 0000000..e31df76 --- /dev/null +++ b/docs/source/x2gobroker.web.json.rst @@ -0,0 +1,7 @@ +x2gobroker.web.json module +========================== + +.. automodule:: x2gobroker.web.json + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.web.plain.rst b/docs/source/x2gobroker.web.plain.rst new file mode 100644 index 0000000..4e18aaa --- /dev/null +++ b/docs/source/x2gobroker.web.plain.rst @@ -0,0 +1,7 @@ +x2gobroker.web.plain module +=========================== + +.. automodule:: x2gobroker.web.plain + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.web.rst b/docs/source/x2gobroker.web.rst new file mode 100644 index 0000000..9896b17 --- /dev/null +++ b/docs/source/x2gobroker.web.rst @@ -0,0 +1,20 @@ +x2gobroker.web package +====================== + +Submodules +---------- + +.. toctree:: + + x2gobroker.web.extras + x2gobroker.web.json + x2gobroker.web.plain + x2gobroker.web.uccs + +Module contents +--------------- + +.. automodule:: x2gobroker.web + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.web.uccs.rst b/docs/source/x2gobroker.web.uccs.rst new file mode 100644 index 0000000..ce9d75a --- /dev/null +++ b/docs/source/x2gobroker.web.uccs.rst @@ -0,0 +1,7 @@ +x2gobroker.web.uccs module +========================== + +.. automodule:: x2gobroker.web.uccs + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/source/x2gobroker.x2gobroker_exceptions.rst b/docs/source/x2gobroker.x2gobroker_exceptions.rst new file mode 100644 index 0000000..f9c22ab --- /dev/null +++ b/docs/source/x2gobroker.x2gobroker_exceptions.rst @@ -0,0 +1,7 @@ +x2gobroker.x2gobroker_exceptions module +======================================= + +.. automodule:: x2gobroker.x2gobroker_exceptions + :members: + :undoc-members: + :show-inheritance: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 74e54524d44a7ec5499dcbd3dcd30e367c1ec394 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 7 09:10:56 2018 +0200 docs/source: Add Sphinx Build configuration. --- docs/Makefile | 225 ++++++++++++++++++ docs/source/_static/.placeholder | 0 docs/source/_templates/.placeholder | 0 docs/source/conf.py | 441 ++++++++++++++++++++++++++++++++++++ docs/source/index.rst | 22 ++ 5 files changed, 688 insertions(+) diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..9e23aa9 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,225 @@ +# Makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +PAPER = +BUILDDIR = build + +# Internal variables. +PAPEROPT_a4 = -D latex_paper_size=a4 +PAPEROPT_letter = -D latex_paper_size=letter +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source +# the i18n builder cannot share the environment and doctrees with the others +I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source + +.PHONY: help +help: + @echo "Please use \`make <target>' where <target> is one of" + @echo " html to make standalone HTML files" + @echo " dirhtml to make HTML files named index.html in directories" + @echo " singlehtml to make a single large HTML file" + @echo " pickle to make pickle files" + @echo " json to make JSON files" + @echo " htmlhelp to make HTML files and a HTML help project" + @echo " qthelp to make HTML files and a qthelp project" + @echo " applehelp to make an Apple Help Book" + @echo " devhelp to make HTML files and a Devhelp project" + @echo " epub to make an epub" + @echo " epub3 to make an epub3" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" + @echo " latexpdf to make LaTeX files and run them through pdflatex" + @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" + @echo " text to make text files" + @echo " man to make manual pages" + @echo " texinfo to make Texinfo files" + @echo " info to make Texinfo files and run them through makeinfo" + @echo " gettext to make PO message catalogs" + @echo " changes to make an overview of all changed/added/deprecated items" + @echo " xml to make Docutils-native XML files" + @echo " pseudoxml to make pseudoxml-XML files for display purposes" + @echo " linkcheck to check all external links for integrity" + @echo " doctest to run all doctests embedded in the documentation (if enabled)" + @echo " coverage to run coverage check of the documentation (if enabled)" + @echo " dummy to check syntax errors of document sources" + +.PHONY: clean +clean: + rm -rf $(BUILDDIR)/* + +.PHONY: html +html: + $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." + +.PHONY: dirhtml +dirhtml: + $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml + @echo + @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." + +.PHONY: singlehtml +singlehtml: + $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml + @echo + @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." + +.PHONY: pickle +pickle: + $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle + @echo + @echo "Build finished; now you can process the pickle files." + +.PHONY: json +json: + $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json + @echo + @echo "Build finished; now you can process the JSON files." + +.PHONY: htmlhelp +htmlhelp: + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp + @echo + @echo "Build finished; now you can run HTML Help Workshop with the" \ + ".hhp project file in $(BUILDDIR)/htmlhelp." + +.PHONY: qthelp +qthelp: + $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp + @echo + @echo "Build finished; now you can run "qcollectiongenerator" with the" \ + ".qhcp project file in $(BUILDDIR)/qthelp, like this:" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/X2GoSessionBroker.qhcp" + @echo "To view the help file:" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/X2GoSessionBroker.qhc" + +.PHONY: applehelp +applehelp: + $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp + @echo + @echo "Build finished. The help book is in $(BUILDDIR)/applehelp." + @echo "N.B. You won't be able to view it unless you put it in" \ + "~/Library/Documentation/Help or install it in your application" \ + "bundle." + +.PHONY: devhelp +devhelp: + $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp + @echo + @echo "Build finished." + @echo "To view the help file:" + @echo "# mkdir -p $$HOME/.local/share/devhelp/X2GoSessionBroker" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/X2GoSessionBroker" + @echo "# devhelp" + +.PHONY: epub +epub: + $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub + @echo + @echo "Build finished. The epub file is in $(BUILDDIR)/epub." + +.PHONY: epub3 +epub3: + $(SPHINXBUILD) -b epub3 $(ALLSPHINXOPTS) $(BUILDDIR)/epub3 + @echo + @echo "Build finished. The epub3 file is in $(BUILDDIR)/epub3." + +.PHONY: latex +latex: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." + @echo "Run \`make' in that directory to run these through (pdf)latex" \ + "(use \`make latexpdf' here to do that automatically)." + +.PHONY: latexpdf +latexpdf: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through pdflatex..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +.PHONY: latexpdfja +latexpdfja: + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex + @echo "Running LaTeX files through platex and dvipdfmx..." + $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." + +.PHONY: text +text: + $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text + @echo + @echo "Build finished. The text files are in $(BUILDDIR)/text." + +.PHONY: man +man: + $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man + @echo + @echo "Build finished. The manual pages are in $(BUILDDIR)/man." + +.PHONY: texinfo +texinfo: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo + @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." + @echo "Run \`make' in that directory to run these through makeinfo" \ + "(use \`make info' here to do that automatically)." + +.PHONY: info +info: + $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo + @echo "Running Texinfo files through makeinfo..." + make -C $(BUILDDIR)/texinfo info + @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." + +.PHONY: gettext +gettext: + $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale + @echo + @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." + +.PHONY: changes +changes: + $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes + @echo + @echo "The overview file is in $(BUILDDIR)/changes." + +.PHONY: linkcheck +linkcheck: + $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck + @echo + @echo "Link check complete; look for any errors in the above output " \ + "or in $(BUILDDIR)/linkcheck/output.txt." + +.PHONY: doctest +doctest: + $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest + @echo "Testing of doctests in the sources finished, look at the " \ + "results in $(BUILDDIR)/doctest/output.txt." + +.PHONY: coverage +coverage: + $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage + @echo "Testing of coverage in the sources finished, look at the " \ + "results in $(BUILDDIR)/coverage/python.txt." + +.PHONY: xml +xml: + $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml + @echo + @echo "Build finished. The XML files are in $(BUILDDIR)/xml." + +.PHONY: pseudoxml +pseudoxml: + $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml + @echo + @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." + +.PHONY: dummy +dummy: + $(SPHINXBUILD) -b dummy $(ALLSPHINXOPTS) $(BUILDDIR)/dummy + @echo + @echo "Build finished. Dummy builder generates no files." diff --git a/docs/source/_static/.placeholder b/docs/source/_static/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/docs/source/_templates/.placeholder b/docs/source/_templates/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/docs/source/conf.py b/docs/source/conf.py new file mode 100644 index 0000000..336242e --- /dev/null +++ b/docs/source/conf.py @@ -0,0 +1,441 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# +# X2Go Session Broker documentation build configuration file, created by +# sphinx-quickstart on Fri Sep 7 08:45:37 2018. +# +# This file is execfile()d with the current directory set to its +# containing dir. +# +# Note that not all possible configuration values are present in this +# autogenerated file. +# +# All configuration values have a default; values that are commented out +# serve to show the default. + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +# +import os +import sys +sys.path.insert(0, os.path.abspath('../../')) +import x2gobroker +import distutils.version +import sphinx + +from datetime import date + +sphinxver = distutils.version.LooseVersion(sphinx.__version__) + +# -- General configuration ------------------------------------------------ + +# If your documentation needs a minimal Sphinx version, state it here. +# +# needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ + 'sphinx.ext.autodoc', + 'sphinx.ext.todo', +] +sphinx_want_ver = distutils.version.LooseVersion('1.0') +if sphinxver >= sphinx_want_ver: + extensions.append('sphinx.ext.viewcode') + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix(es) of source filenames. +# You can specify multiple suffix as a list of string: +# +# source_suffix = ['.rst', '.md'] +source_suffix = '.rst' + +# The encoding of source files. +# +# source_encoding = 'utf-8-sig' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = 'X2Go Session Broker' +copyright = '{year}, {author}'.format(year=date.today().year, author=x2gobroker.__AUTHOR__) +author = '{author}'.format(author=x2gobroker.__AUTHOR__) + +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the +# built documents. +# +# The short X.Y version. +version = x2gobroker.__VERSION__ +# The full version, including alpha/beta/rc tags. +release = x2gobroker.__VERSION__ + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +# +# This is also used if you do content translation via gettext catalogs. +# Usually you set "language" from the command line for these cases. +language = 'en' + +# There are two options for replacing |today|: either, you set today to some +# non-false value, then it is used: +# +# today = '' +# +# Else, today_fmt is used as the format for a strftime call. +# +# today_fmt = '%B %d, %Y' + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +# This patterns also effect to html_static_path and html_extra_path +exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] + +# The reST default role (used for this markup: `text`) to use for all +# documents. +# +# default_role = None + +# If true, '()' will be appended to :func: etc. cross-reference text. +# +# add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +# +# add_module_names = True + +# If true, sectionauthor and moduleauthor directives will be shown in the +# output. They are ignored by default. +# +# show_authors = False + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# A list of ignored prefixes for module index sorting. +# modindex_common_prefix = [] + +# If true, keep warnings as "system message" paragraphs in the built documents. +# keep_warnings = False + +# If true, `todo` and `todoList` produce output, else they produce nothing. +todo_include_todos = True + + +# -- Options for HTML output ---------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +# +sphinx_want_ver = distutils.version.LooseVersion('1.3') +if sphinxver >= sphinx_want_ver: + html_theme = 'classic' +else: + html_theme = 'default' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +# +# html_theme_options = {} + +# Add any paths that contain custom themes here, relative to this directory. +# html_theme_path = [] + +# The name for this set of Sphinx documents. +# "<project> v<release> documentation" by default. +# +html_title = 'Python X2Go Broker API Documentation (v{ver})'.format(ver=release) + +# A shorter title for the navigation bar. Default is the same as html_title. +# +# html_short_title = None + +# The name of an image file (relative to this directory) to place at the top +# of the sidebar. +# +# html_logo = None + +# The name of an image file (relative to this directory) to use as a favicon of +# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# pixels large. +# +# html_favicon = None + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# Add any extra paths that contain custom files (such as robots.txt or +# .htaccess) here, relative to this directory. These files are copied +# directly to the root of the documentation. +# +# html_extra_path = [] + +# If not None, a 'Last updated on:' timestamp is inserted at every page +# bottom, using the given strftime format. +# The empty string is equivalent to '%b %d, %Y'. +# +# html_last_updated_fmt = None + +# If true, SmartyPants will be used to convert quotes and dashes to +# typographically correct entities. +# +# html_use_smartypants = True + +# Custom sidebar templates, maps document names to template names. +# +# html_sidebars = {} + +# Additional templates that should be rendered to pages, maps page names to +# template names. +# +# html_additional_pages = {} + +# If false, no module index is generated. +# +# html_domain_indices = True + +# If false, no index is generated. +# +# html_use_index = True + +# If true, the index is split into individual pages for each letter. +# +# html_split_index = False + +# If true, links to the reST sources are added to the pages. +# +# html_show_sourcelink = True + +# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. +# +# html_show_sphinx = True + +# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. +# +# html_show_copyright = True + +# If true, an OpenSearch description file will be output, and all pages will +# contain a <link> tag referring to it. The value of this option must be the +# base URL from which the finished HTML is served. +# +# html_use_opensearch = '' + +# This is the file name suffix for HTML files (e.g. ".xhtml"). +# html_file_suffix = None + +# Language to be used for generating the HTML full-text search index. +# Sphinx supports the following languages: +# 'da', 'de', 'en', 'es', 'fi', 'fr', 'h', 'it', 'ja' +# 'nl', 'no', 'pt', 'ro', 'r', 'sv', 'tr', 'zh' +# +# html_search_language = 'en' + +# A dictionary with options for the search language support, empty by default. +# 'ja' uses this config value. +# 'zh' user can custom change `jieba` dictionary path. +# +# html_search_options = {'type': 'default'} + +# The name of a javascript file (relative to the configuration directory) that +# implements a search results scorer. If empty, the default will be used. +# +# html_search_scorer = 'scorer.js' + +# Output file base name for HTML help builder. +htmlhelp_basename = 'PythonX2GoBrokerDoc' + +# -- Options for LaTeX output --------------------------------------------- + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # + # 'papersize': 'letterpaper', + + # The font size ('10pt', '11pt' or '12pt'). + # + # 'pointsize': '10pt', + + # Additional stuff for the LaTeX preamble. + # + # 'preamble': '', + + # Latex figure (float) alignment + # + # 'figure_align': 'htbp', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). +latex_documents = [ + (master_doc, 'PythonX2GoBroker.tex', 'X2Go Session Broker API Documentation', + 'Mike Gabriel', 'manual'), +] + +# The name of an image file (relative to this directory) to place at the top of +# the title page. +# +# latex_logo = None + +# For "manual" documents, if this is true, then toplevel headings are parts, +# not chapters. +# +# latex_use_parts = False + +# If true, show page references after internal links. +# +# latex_show_pagerefs = False + +# If true, show URL addresses after external links. +# +# latex_show_urls = False + +# Documents to append as an appendix to all manuals. +# +# latex_appendices = [] + +# It false, will not define \strong, \code, itleref, \crossref ... but only +# \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added +# packages. +# +# latex_keep_old_macro_names = True + +# If false, no module index is generated. +# +# latex_domain_indices = True + + +# -- Options for manual page output --------------------------------------- + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + (master_doc, 'x2gobroker', 'X2Go Session Broker API Documentation', + [author], 1) +] + +# If true, show URL addresses after external links. +# +# man_show_urls = False + + +# -- Options for Texinfo output ------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + (master_doc, 'X2GoBroker', 'X2Go Session Broker API Documentation', + author, 'X2GoBroker', 'Manage an X2Go Server Farm via Session Brokerage', + 'Miscellaneous'), +] + +# Documents to append as an appendix to all manuals. +# +# texinfo_appendices = [] + +# If false, no module index is generated. +# +# texinfo_domain_indices = True + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +# +# texinfo_show_urls = 'footnote' + +# If true, do not generate a @detailmenu in the "Top" node's menu. +# +# texinfo_no_detailmenu = False + + +# -- Options for Epub output ---------------------------------------------- + +# Bibliographic Dublin Core info. +epub_title = project +epub_author = author +epub_publisher = author +epub_copyright = copyright + +# The basename for the epub file. It defaults to the project name. +# epub_basename = project + +# The HTML theme for the epub output. Since the default themes are not +# optimized for small screen space, using the same theme for HTML and epub +# output is usually not wise. This defaults to 'epub', a theme designed to save +# visual space. +# +# epub_theme = 'epub' + +# The language of the text. It defaults to the language option +# or 'en' if the language is not set. +# +# epub_language = '' + +# The scheme of the identifier. Typical schemes are ISBN or URL. +# epub_scheme = '' + +# The unique identifier of the text. This can be a ISBN number +# or the project homepage. +# +# epub_identifier = '' + +# A unique identification for the text. +# +# epub_uid = '' + +# A tuple containing the cover image and cover page html template filenames. +# +# epub_cover = () + +# A sequence of (type, uri, title) tuples for the guide element of content.opf. +# +# epub_guide = () + +# HTML files that should be inserted before the pages created by sphinx. +# The format is a list of tuples containing the path and title. +# +# epub_pre_files = [] + +# HTML files that should be inserted after the pages created by sphinx. +# The format is a list of tuples containing the path and title. +# +# epub_post_files = [] + +# A list of files that should not be packed into the epub file. +epub_exclude_files = ['search.html'] + +# The depth of the table of contents in toc.ncx. +# +# epub_tocdepth = 3 + +# Allow duplicate toc entries. +# +# epub_tocdup = True + +# Choose between 'default' and 'includehidden'. +# +# epub_tocscope = 'default' + +# Fix unsupported image types using the Pillow. +# +# epub_fix_images = False + +# Scale large images. +# +# epub_max_image_width = 0 + +# How to display URL addresses: 'footnote', 'no', or 'inline'. +# +# epub_show_urls = 'inline' + +# If false, no index is generated. +# +# epub_use_index = True diff --git a/docs/source/index.rst b/docs/source/index.rst new file mode 100644 index 0000000..e35fb50 --- /dev/null +++ b/docs/source/index.rst @@ -0,0 +1,22 @@ +.. X2Go Session Broker documentation master file, created by + sphinx-quickstart on Fri Sep 7 08:45:37 2018. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +Welcome to X2Go Session Broker's documentation! +=============================================== + +Contents: + +.. toctree:: + :maxdepth: 2 + + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` + -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit ded0c51082883820cb07206eab96400671ae3419 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 7 10:56:52 2018 +0200 debian/: New bin:pkg python-x2gobroker-doc. Build API documentation with Sphinx and include it in a separate -doc package. --- debian/control | 28 ++++++++++++++++++++++++++++ debian/python-x2gobroker-doc.doc-base | 10 ++++++++++ debian/python-x2gobroker-doc.docs | 1 + debian/python-x2gobroker-doc.links | 3 +++ debian/rules | 6 ++++++ debian/x2gobroker.docs | 2 +- 6 files changed, 49 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index c122b1e..d3f02a3 100644 --- a/debian/control +++ b/debian/control @@ -16,6 +16,7 @@ Build-Depends: python3-setuptools, python3-nose, python3-paste, + python3-sphinx, Standards-Version: 4.1.0 XS-Python-Version: >= 3.4 @@ -113,6 +114,33 @@ Description: X2Go Session Broker (Python3 modules) This package contains common files needed by all X2Go session brokers being package for this distribution. + +Package: python-x2gobroker-doc +Section: doc +Architecture: all +Depends: + ${misc:Depends}, + libjs-jquery, + libjs-underscore, +Description: X2Go Session Broker (Python3 module documentation) + X2Go is a server based computing environment with + - session resuming + - low bandwidth support + - session brokerage 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 the API documentation of the various X2Go Broker + backends and shows how to extend the X2Go Session Broker. + Package: x2gobroker-authservice Architecture: all Depends: diff --git a/debian/python-x2gobroker-doc.doc-base b/debian/python-x2gobroker-doc.doc-base new file mode 100644 index 0000000..b2e0156 --- /dev/null +++ b/debian/python-x2gobroker-doc.doc-base @@ -0,0 +1,10 @@ +Document: python-x2gobroker +Title: Python X2Go Broker API +Author: Mike Gabriel +Abstract: This document describes the internals of the X2Go Session Broker and + how to extend it +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/python-x2gobroker-doc/html/index.html +Files: /usr/share/doc/python-x2gobroker-doc/html/* diff --git a/debian/python-x2gobroker-doc.docs b/debian/python-x2gobroker-doc.docs new file mode 100644 index 0000000..ef1c0c7 --- /dev/null +++ b/debian/python-x2gobroker-doc.docs @@ -0,0 +1 @@ +docs/build/html/ diff --git a/debian/python-x2gobroker-doc.links b/debian/python-x2gobroker-doc.links new file mode 100644 index 0000000..01dbc36 --- /dev/null +++ b/debian/python-x2gobroker-doc.links @@ -0,0 +1,3 @@ +usr/share/doc/python-x2gobroker-doc/html usr/share/doc/python3-x2gobroker/html +usr/share/javascript/jquery/jquery.js usr/share/doc/python-x2gobroker-doc/html/_static/jquery.js +usr/share/javascript/underscore/underscore.js usr/share/doc/python-x2gobroker-doc/html/_static/underscore.js diff --git a/debian/rules b/debian/rules index 4fdc8f6..0bb7614 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,11 @@ DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python3 && echo "" || echo "pysu include /usr/share/cdbs/1/class/python-distutils.mk +configure/python-x2gobroker-doc:: + if [ ! -f docs/build/html/index.html ]; then \ + make -f Makefile.docupload docbuild; \ + fi + common-binary-indep:: cp pam/x2gobroker.Debian pam/x2gobroker cp x2gobroker-ssh.sudo x2gobroker-ssh @@ -45,6 +50,7 @@ common-binary-arch:: common-binary-indep common-binary-post-install-arch:: list-missing clean:: + make -f Makefile.docupload clean rm -f pam/x2gobroker rm -f lib/x2gobroker-agent rm -f x2gobroker-ssh diff --git a/debian/x2gobroker.docs b/debian/x2gobroker.docs index 1c04808..b71571a 100644 --- a/debian/x2gobroker.docs +++ b/debian/x2gobroker.docs @@ -1 +1 @@ -doc/README.x2goclient+broker.getting-started \ No newline at end of file +docs/README.x2goclient+broker.getting-started.md \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 455897012b07cd5c5b7e2defdbc4c113cdadb800 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 7 11:01:18 2018 +0200 Copyright: Happy (new) year 2018 (belated). --- Makefile | 2 +- Makefile.docupload | 2 +- bin/x2gobroker | 2 +- bin/x2gobroker-testauth | 2 +- debian/copyright | 8 ++++---- debian/rules | 2 +- etc/broker/x2gobroker-authservice-logger.conf | 2 +- etc/broker/x2gobroker-loadchecker-logger.conf | 2 +- etc/broker/x2gobroker-loggers.conf | 2 +- etc/x2gobroker.conf | 2 +- init/x2gobroker-authservice.init | 2 +- init/x2gobroker-daemon.init | 2 +- init/x2gobroker-loadchecker.init | 2 +- lib/x2gobroker-agent.pl | 2 +- sbin/x2gobroker-authservice | 2 +- sbin/x2gobroker-daemon-debug | 2 +- sbin/x2gobroker-keygen | 2 +- sbin/x2gobroker-loadchecker | 2 +- sbin/x2gobroker-pubkeyauthorizer | 2 +- sbin/x2gobroker-testagent | 2 +- setup.py | 2 +- src/x2gobroker-agent.c | 2 +- src/x2gobroker-ssh.c | 2 +- test.py | 2 +- x2gobroker/__init__.py | 2 +- x2gobroker/_paramiko.py | 2 +- x2gobroker/agent.py | 2 +- x2gobroker/authmechs/__init__.py | 2 +- x2gobroker/authmechs/base_authmech.py | 2 +- x2gobroker/authmechs/https_get_authmech.py | 4 ++-- x2gobroker/authmechs/none_authmech.py | 2 +- x2gobroker/authmechs/pam_authmech.py | 2 +- x2gobroker/authmechs/testsuite_authmech.py | 2 +- x2gobroker/authservice.py | 2 +- x2gobroker/basicauth.py | 2 +- x2gobroker/brokers/__init__.py | 2 +- x2gobroker/brokers/base_broker.py | 4 ++-- x2gobroker/brokers/inifile_broker.py | 2 +- x2gobroker/brokers/zeroconf_broker.py | 2 +- x2gobroker/client/__init__.py | 2 +- x2gobroker/client/plain.py | 2 +- x2gobroker/config.py | 2 +- x2gobroker/defaults.py | 2 +- x2gobroker/loadchecker.py | 2 +- x2gobroker/loggers.py | 2 +- x2gobroker/nameservices/__init__.py | 2 +- x2gobroker/nameservices/base_nameservice.py | 2 +- x2gobroker/nameservices/libnss_nameservice.py | 2 +- x2gobroker/nameservices/testsuite_nameservice.py | 2 +- x2gobroker/optional_scripts/__init__.py | 2 +- x2gobroker/optional_scripts/base_script.py | 2 +- x2gobroker/tests/__init__.py | 2 +- x2gobroker/tests/runalltests.py | 2 +- x2gobroker/tests/test_broker_agent.py | 2 +- x2gobroker/tests/test_broker_base.py | 2 +- x2gobroker/tests/test_broker_inifile.py | 2 +- x2gobroker/tests/test_broker_zeroconf.py | 2 +- x2gobroker/tests/test_client_plain_base.py | 2 +- x2gobroker/tests/test_utils.py | 2 +- x2gobroker/tests/test_web_plain_base.py | 2 +- x2gobroker/tests/test_web_plain_inifile.py | 2 +- x2gobroker/tests/test_web_plain_zeroconf.py | 2 +- x2gobroker/tests/test_web_uccs_zeroconf.py | 2 +- x2gobroker/uccsjson.py | 2 +- x2gobroker/utils.py | 2 +- x2gobroker/web/__init__.py | 2 +- x2gobroker/web/extras.py | 2 +- x2gobroker/web/json.py | 2 +- x2gobroker/web/plain.py | 2 +- x2gobroker/web/uccs.py | 2 +- x2gobroker/x2gobroker_exceptions.py | 2 +- 71 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Makefile b/Makefile index adf1aac..e572796 100755 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/Makefile.docupload b/Makefile.docupload index 1fba4b3..8c43fbc 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -1,6 +1,6 @@ #!/usr/bin/make -f # Makefile.docupload file - for python-x2gobroker -# Copyright 2010-2016 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3+ applies to this file +# Copyright 2010-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, GPLv3+ applies to this file VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1` DOC_HOST=code.x2go.org diff --git a/bin/x2gobroker b/bin/x2gobroker index 98b71ba..47649f1 100755 --- a/bin/x2gobroker +++ b/bin/x2gobroker @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index 62da53a..84a4750 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/debian/copyright b/debian/copyright index 6b7977d..64f682d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,24 +6,24 @@ Source: http://code.x2go.org/releases/source/x2gobroker Files: * Copyright: - 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + 2012-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: AGPL-3+ Files: x2gobroker/authmechs/https_get_authmech.py x2gobroker/brokers/base_broker.py x2gobroker/optional_scripts/__init__.py x2gobroker/optional_scripts/base_script.py -Copyright: 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2012-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2014, Josh Lukens <jlukens@botch.com> License: AGPL-3+ Files: lib/x2gobroker-agent.pl -Copyright: 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2012-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> 2012, Oleksandr Shneyder <oleksandr.schneyder@obviously-nice.de> License: AGPL-3+ Files: debian/* -Copyright: 2012-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Copyright: 2012-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: AGPL-3+ License: AGPL-3+ diff --git a/debian/rules b/debian/rules index 0bb7614..a780b64 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/etc/broker/x2gobroker-authservice-logger.conf b/etc/broker/x2gobroker-authservice-logger.conf index 7d08674..844fe46 100644 --- a/etc/broker/x2gobroker-authservice-logger.conf +++ b/etc/broker/x2gobroker-authservice-logger.conf @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/etc/broker/x2gobroker-loadchecker-logger.conf b/etc/broker/x2gobroker-loadchecker-logger.conf index fe36e9a..d3fa75b 100644 --- a/etc/broker/x2gobroker-loadchecker-logger.conf +++ b/etc/broker/x2gobroker-loadchecker-logger.conf @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf index 2cf3446..7e6814c 100644 --- a/etc/broker/x2gobroker-loggers.conf +++ b/etc/broker/x2gobroker-loggers.conf @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf index 23fe594..7ba70be 100644 --- a/etc/x2gobroker.conf +++ b/etc/x2gobroker.conf @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/init/x2gobroker-authservice.init b/init/x2gobroker-authservice.init index 074faa8..98f75b4 100755 --- a/init/x2gobroker-authservice.init +++ b/init/x2gobroker-authservice.init @@ -2,7 +2,7 @@ # # Start the X2Go Session Broker PAM Authentication Service # -# Copyright © 2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright © 2014-2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO diff --git a/init/x2gobroker-daemon.init b/init/x2gobroker-daemon.init index 9e39fd0..14b2215 100755 --- a/init/x2gobroker-daemon.init +++ b/init/x2gobroker-daemon.init @@ -2,7 +2,7 @@ # # Start the X2Go Session Broker standalone daemon # -# Copyright © 2012-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright © 2012-2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO diff --git a/init/x2gobroker-loadchecker.init b/init/x2gobroker-loadchecker.init index 8be4381..31e3301 100755 --- a/init/x2gobroker-loadchecker.init +++ b/init/x2gobroker-loadchecker.init @@ -2,7 +2,7 @@ # # Start the X2Go Session Broker Load Checker Service # -# Copyright © 2014 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright © 2014-2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Distributable under the terms of the GNU AGPL version 3+. # ### BEGIN INIT INFO diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 18d6492..b9359ba 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -2,7 +2,7 @@ # This file is part of the X2Go Project - http://www.x2go.org # Copyright (C) 2011-2015 by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 9a9994b..baa75c8 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index 580bbdb..0df520a 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index ca98b49..95a5b40 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-loadchecker b/sbin/x2gobroker-loadchecker index 731c20c..98245f9 100755 --- a/sbin/x2gobroker-loadchecker +++ b/sbin/x2gobroker-loadchecker @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index f87704f..6624427 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index d133527..dfddca6 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/setup.py b/setup.py index e9cdf9e..245ebf1 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/src/x2gobroker-agent.c b/src/x2gobroker-agent.c index c2f1db1..be88f60 100644 --- a/src/x2gobroker-agent.c +++ b/src/x2gobroker-agent.c @@ -1,6 +1,6 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2012-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * Copyright (C) 2012-2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/x2gobroker-ssh.c b/src/x2gobroker-ssh.c index dc10cd3..1e7786b 100644 --- a/src/x2gobroker-ssh.c +++ b/src/x2gobroker-ssh.c @@ -1,6 +1,6 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2012-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * Copyright (C) 2012-2018 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/test.py b/test.py index fd7860c..f463672 100755 --- a/test.py +++ b/test.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Copyright (C) 2014-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2014-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index a1feba1..59e5e81 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/_paramiko.py b/x2gobroker/_paramiko.py index 631eabe..ffaada0 100644 --- a/x2gobroker/_paramiko.py +++ b/x2gobroker/_paramiko.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # Python X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 8d31d16..5aaa115 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/__init__.py b/x2gobroker/authmechs/__init__.py index afa803f..6c377e8 100644 --- a/x2gobroker/authmechs/__init__.py +++ b/x2gobroker/authmechs/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/base_authmech.py b/x2gobroker/authmechs/base_authmech.py index f0531a1..e1cda02 100644 --- a/x2gobroker/authmechs/base_authmech.py +++ b/x2gobroker/authmechs/base_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/https_get_authmech.py b/x2gobroker/authmechs/https_get_authmech.py index 13f945c..fbba640 100644 --- a/x2gobroker/authmechs/https_get_authmech.py +++ b/x2gobroker/authmechs/https_get_authmech.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2015 by Josh Lukens <jlukens@botch.com> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/none_authmech.py b/x2gobroker/authmechs/none_authmech.py index cac0b6e..9110e07 100644 --- a/x2gobroker/authmechs/none_authmech.py +++ b/x2gobroker/authmechs/none_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py index 44b140a..5dea596 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/authmechs/pam_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/testsuite_authmech.py b/x2gobroker/authmechs/testsuite_authmech.py index b3ad222..47272ec 100644 --- a/x2gobroker/authmechs/testsuite_authmech.py +++ b/x2gobroker/authmechs/testsuite_authmech.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py index 4df5187..4200589 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index 4ae0620..0ed69b8 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/__init__.py b/x2gobroker/brokers/__init__.py index afa803f..6c377e8 100644 --- a/x2gobroker/brokers/__init__.py +++ b/x2gobroker/brokers/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 97cf132..9c1e68d 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2012-2015 by Josh Lukens <jlukens@botch.com> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index f4c8104..72ddd9f 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index 2d981f8..656f0dc 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/client/__init__.py b/x2gobroker/client/__init__.py index afa803f..6c377e8 100644 --- a/x2gobroker/client/__init__.py +++ b/x2gobroker/client/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/client/plain.py b/x2gobroker/client/plain.py index 4f7cac8..dad51ab 100644 --- a/x2gobroker/client/plain.py +++ b/x2gobroker/client/plain.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/config.py b/x2gobroker/config.py index 886a3a6..049a0c5 100644 --- a/x2gobroker/config.py +++ b/x2gobroker/config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 3b7fbc1..0196496 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/loadchecker.py b/x2gobroker/loadchecker.py index 71da459..ed1e686 100644 --- a/x2gobroker/loadchecker.py +++ b/x2gobroker/loadchecker.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 82db994..1baca90 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/__init__.py b/x2gobroker/nameservices/__init__.py index afa803f..6c377e8 100644 --- a/x2gobroker/nameservices/__init__.py +++ b/x2gobroker/nameservices/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/base_nameservice.py b/x2gobroker/nameservices/base_nameservice.py index cb64c66..0dc99a2 100644 --- a/x2gobroker/nameservices/base_nameservice.py +++ b/x2gobroker/nameservices/base_nameservice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/libnss_nameservice.py b/x2gobroker/nameservices/libnss_nameservice.py index 7e804e4..5db99e9 100644 --- a/x2gobroker/nameservices/libnss_nameservice.py +++ b/x2gobroker/nameservices/libnss_nameservice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/testsuite_nameservice.py b/x2gobroker/nameservices/testsuite_nameservice.py index 57fc992..a6be6ad 100644 --- a/x2gobroker/nameservices/testsuite_nameservice.py +++ b/x2gobroker/nameservices/testsuite_nameservice.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/optional_scripts/__init__.py b/x2gobroker/optional_scripts/__init__.py index 78d3433..d6862c2 100755 --- a/x2gobroker/optional_scripts/__init__.py +++ b/x2gobroker/optional_scripts/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright (C) 2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/optional_scripts/base_script.py b/x2gobroker/optional_scripts/base_script.py index 37c95dd..4a64160 100755 --- a/x2gobroker/optional_scripts/base_script.py +++ b/x2gobroker/optional_scripts/base_script.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # Copyright (C) 2014 by Josh Lukens <jlukens@botch.com> # # X2Go Session Broker is free software; you can redistribute it and/or modify diff --git a/x2gobroker/tests/__init__.py b/x2gobroker/tests/__init__.py index cf54635..7d2121e 100644 --- a/x2gobroker/tests/__init__.py +++ b/x2gobroker/tests/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/runalltests.py b/x2gobroker/tests/runalltests.py index 761e495..af324a7 100644 --- a/x2gobroker/tests/runalltests.py +++ b/x2gobroker/tests/runalltests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2010-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_broker_agent.py b/x2gobroker/tests/test_broker_agent.py index 0cb694c..f93119e 100644 --- a/x2gobroker/tests/test_broker_agent.py +++ b/x2gobroker/tests/test_broker_agent.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index fc132eb..769e37c 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -1,5 +1,5 @@ -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 4f878ff..41462f4 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index 4419299..4d95325 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_client_plain_base.py b/x2gobroker/tests/test_client_plain_base.py index 8152c30..34ce54f 100644 --- a/x2gobroker/tests/test_client_plain_base.py +++ b/x2gobroker/tests/test_client_plain_base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_utils.py b/x2gobroker/tests/test_utils.py index c1ee46f..7d347bd 100644 --- a/x2gobroker/tests/test_utils.py +++ b/x2gobroker/tests/test_utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py index b4d5424..c46e14d 100644 --- a/x2gobroker/tests/test_web_plain_base.py +++ b/x2gobroker/tests/test_web_plain_base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_plain_inifile.py b/x2gobroker/tests/test_web_plain_inifile.py index 68e6e64..7bdd15d 100644 --- a/x2gobroker/tests/test_web_plain_inifile.py +++ b/x2gobroker/tests/test_web_plain_inifile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index 2c18d5a..eabdc44 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_uccs_zeroconf.py b/x2gobroker/tests/test_web_uccs_zeroconf.py index 585a0b6..b4249ee 100644 --- a/x2gobroker/tests/test_web_uccs_zeroconf.py +++ b/x2gobroker/tests/test_web_uccs_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index 7d8a08f..0d4dc5a 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/utils.py b/x2gobroker/utils.py index d665a07..1811ebb 100644 --- a/x2gobroker/utils.py +++ b/x2gobroker/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/__init__.py b/x2gobroker/web/__init__.py index afa803f..6c377e8 100644 --- a/x2gobroker/web/__init__.py +++ b/x2gobroker/web/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py index 0dd74bc..4e1e8fd 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/json.py b/x2gobroker/web/json.py index b28fd09..c96c2ef 100644 --- a/x2gobroker/web/json.py +++ b/x2gobroker/web/json.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index a83df03..36c84cb 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index fd3c1bd..5bef36e 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -1,5 +1,5 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/x2gobroker_exceptions.py b/x2gobroker/x2gobroker_exceptions.py index 4dcfe0a..b766089 100644 --- a/x2gobroker/x2gobroker_exceptions.py +++ b/x2gobroker/x2gobroker_exceptions.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2018 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git