x2gobroker.git - master (branch) updated: 0.0.2.3-72-g8037521 - x2go-commits

28 Nov 2013

The branch, master has been updated
       via  80375216fa0444dde7422a45fb261b215da750f3 (commit)
      from  e5934b60b41789103445dbed922ca0563787625f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 80375216fa0444dde7422a45fb261b215da750f3
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Nov 28 11:13:06 2013 +0100

    Add a start page (,,It works'').

-----------------------------------------------------------------------

Summary of changes:
 bin/x2gobroker           |    1 +
 debian/changelog         |    1 +
 x2gobroker/web/extras.py |   22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+)

The diff of changes is:

diff --git a/bin/x2gobroker b/bin/x2gobroker
index 2a1f319..caaa103 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -43,6 +43,7 @@ def prep_http_mode():
              ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,),
              ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,),
              ('/pubkeys(/*)$', x2gobroker.web.extras.X2GoBrokerPubKeyService,),
+             ('/$', x2gobroker.web.extras.X2GoBrokerItWorks,),
            )
     settings = {
         'log_function': tornado_log_request,
diff --git a/debian/changelog b/debian/changelog
index 4025e53..bfd0428 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
       python-x2gobroker's docs folder.
     - Show correct environment variables in log file prelude when WSGI is used.
     - Fix check-credentials = false for UCCS web frontend.
+    - Add a start page (,,It works'').
   * debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
     + Recommend apache2 and libapache2-mod-wsgi for x2gobroker-wsgi.
diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py
index 1ff31ae..b9c3c24 100644
--- a/x2gobroker/web/extras.py
+++ b/x2gobroker/web/extras.py
@@ -31,6 +31,28 @@ x2gobroker._paramiko.monkey_patch_paramiko()
 import x2gobroker.defaults
 
 
+class X2GoBrokerItWorks(_RequestHandler):
+
+    http_header_items = {
+        'Content-Type': 'text/plain; charset=utf-8',
+        'Expires': '+1h',
+    }
+
+    def _gen_http_header(self):
+
+        for http_header_item in self.http_header_items.keys():
+            self.set_header(http_header_item, self.http_header_items[http_header_item])
+
+    def get(self, *args, **kwargs):
+
+        output = ""
+
+        self.write('<body><html>')
+        self.write('<h1>X2Go Session Broker</h1>')
+        self.write('<p>It works...</p>')
+        self.write('</body></html>')
+
+
 class _RequestHandler(tornado.web.RequestHandler):
     def _handle_request_exception(self, e):
         logger_error.error('HTTP request error: {error_msg}'.format(error_msg=unicode(e)))


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).

    