[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.4-3-ge999834

X2Go dev team git-admin at x2go.org
Wed Feb 27 15:52:34 CET 2013


The branch, master has been updated
       via  e999834af45e0c6d3b603cdf79341abbbbbc1834 (commit)
       via  2b6b1a6ab08fe4a723406812ffdce202ca2f0ea4 (commit)
      from  c6d2b8b91fe67cf9d751131ed0cdab98eb1b0477 (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 e999834af45e0c6d3b603cdf79341abbbbbc1834
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 27 15:52:29 2013 +0100

    /debian/control: Add dependency to python-x2gobroker: python-paramiko.

commit 2b6b1a6ab08fe4a723406812ffdce202ca2f0ea4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 27 15:51:43 2013 +0100

    Prepare for WSGI based integration into an external httpd.

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

Summary of changes:
 debian/changelog |    5 ++++-
 debian/control   |    1 +
 sbin/x2gobroker  |   17 ++++++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 665a585..76f36ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 x2gobroker (0.0.0.5-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (0.0.0.5):
+    - Prepare for WSGI based integration into an external httpd.
+  * /debian/control:
+    + Add dependency to python-x2gobroker: python-paramiko.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 27 Feb 2013 11:55:07 +0100
 
diff --git a/debian/control b/debian/control
index 07868bd..3190f5c 100644
--- a/debian/control
+++ b/debian/control
@@ -151,6 +151,7 @@ Depends:
  python-pampy,
  python-netaddr,
  python-webpy (>= 1:0.37),
+ python-paramiko,
 Suggests:
  apache2 | httpd,
 Description: X2Go http(s) based session broker (Python modules)
diff --git a/sbin/x2gobroker b/sbin/x2gobroker
index 846a7e5..5bf4a01 100755
--- a/sbin/x2gobroker
+++ b/sbin/x2gobroker
@@ -98,6 +98,12 @@ if __name__ == "__main__":
     # some people just give the port but prepend a colon, webpy does not like this, so we strip if off
     cmdline_args.bind = cmdline_args.bind.lstrip(':')
 
+    # tweak cmdline args so that they become suitable for the web.py framework
+    if len(sys.argv) <= 1:
+        sys.argv.append('')
+        sys.argv.append('')
+    sys.argv[1] = cmdline_args.bind
+    sys.argv[2:] = []
 
 # import classes serving the different web.py URLs
 import x2gobroker.web.plain
@@ -117,16 +123,13 @@ urls = ( '/plain/(.*)', 'x2gobroker.web.plain.X2GoBrokerWeb',
           '/pubkeys/', 'x2gobroker.web.extras.X2GoBrokerPubKeyService',
        )
 
+app = web.application(urls, globals(), autoreload=False)
+app.internalerror = web.debugerror
+application = web.wsgifunc()
+
 # run the web.py standalone daemon...
 if __name__ == "__main__":
-    if len(sys.argv) <= 1:
-        sys.argv.append('')
-        sys.argv.append('')
-    sys.argv[1] = cmdline_args.bind
-    sys.argv[2:] = []
     try:
-        app = web.application(urls, globals())
-        app.internalerror = web.debugerror
         app.run()
     except socket.error, e:
         print (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).




More information about the x2go-commits mailing list