[X2go-Commits] x2gobroker.git - master (branch) updated: 0.0.0.1-7-gfe7f06c

X2Go dev team git-admin at x2go.org
Sun Feb 17 10:38:30 CET 2013


The branch, master has been updated
       via  fe7f06c112518bbac361c7e9f80ed721379a0e3b (commit)
      from  5231ba48183cc603a5193400884dd01b360491ba (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 fe7f06c112518bbac361c7e9f80ed721379a0e3b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Feb 17 10:40:51 2013 +0100

    some minor fixes found during first load balancing tests

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

Summary of changes:
 debian/x2gobroker-daemon.default |    9 ++++++++-
 debian/x2gobroker-daemon.init    |    6 +++---
 etc/x2gobroker.conf              |    2 +-
 sbin/x2gobroker                  |    3 +++
 4 files changed, 15 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default
index 47ccb43..452a75b 100644
--- a/debian/x2gobroker-daemon.default
+++ b/debian/x2gobroker-daemon.default
@@ -24,7 +24,14 @@ START_DAEMON=true
 # path to the X2Go Session Broker's agent command
 #X2GOBROKER_AGENT_CMD=/usr/lib/x2go/x2gobroker-agent
 
-### enable SSL, you will have to create your own SSL certificates ###
+##########################################################
+###                                                    ###
+### Enable SSL Support                                 ###
+###   o You have to create your own SSL certificates   ###
+###   o You have to actively uncomment the below SSL   ###
+###     relevant line to enable https:// in x2gobroker ###
+###                                                    ###
+##########################################################
 
 # SSL certificate file
 #X2GOBROKER_SSL_CERTFILE=/etc/x2go/broker/ssl/broker.crt
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
index 0ee9aed..d14bb8f 100644
--- a/debian/x2gobroker-daemon.init
+++ b/debian/x2gobroker-daemon.init
@@ -36,10 +36,10 @@ X2GOBROKER_SSL_CERTFILE=
 X2GOBROKER_SSL_KEYFILE=
 test -f $DEBIANCONFIG && . $DEBIANCONFIG
 
-export X2GOBROKER_DEBUG=0
-export X2GOBROKER_CONFIG="/etc/x2go/x2gobroker.conf"
+export X2GOBROKER_DEBUG
+export X2GOBROKER_CONFIG
 export X2GOBROKER_DEFAULT_BACKEND
-export X2GOBROKER_SESSIONPROFILES="/etc/x2go/broker/x2gobroker-sessionprofiles.conf"
+export X2GOBROKER_SESSIONPROFILES
 export X2GOBROKER_AGENT_CMD
 export X2GOBROKER_SSL_CERTFILE
 export X2GOBROKER_SSL_KEYFILE
diff --git a/etc/x2gobroker.conf b/etc/x2gobroker.conf
index 0999376..83f6bd8 100644
--- a/etc/x2gobroker.conf
+++ b/etc/x2gobroker.conf
@@ -88,7 +88,7 @@
 # on large deployments it is recommended to ignore primary group memberships
 # traversing into all user accounts for primary group detection can be quite
 # CPU intensive on the X2Go Broker server.
-#ignore-primary-group-memberships = True
+#ignore-primary-group-memberships = true
 
 ###
 ### BACKEND section
diff --git a/sbin/x2gobroker b/sbin/x2gobroker
index 5c1fdd8..7ca11ce 100755
--- a/sbin/x2gobroker
+++ b/sbin/x2gobroker
@@ -61,6 +61,9 @@ if __name__ == "__main__":
         x2gobroker.defaults.X2GOBROKER_CONFIG = cmdline_args.config_file
     x2gobroker.defaults.X2GOBROKER_DEBUG = cmdline_args.debug
 
+    # 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(':')
+
 
 # import classes serving the different web.py URLs
 from x2gobroker.web.plain import *


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