[X2Go-Commits] [x2gobroker] 01/01: Make sure that without configuration files, the HTTP broker listens to port 8080.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 523519085d7539fad968d7b1527f00e41eff6344
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 28 17:58:01 2014 +0100

    Make sure that without configuration files, the HTTP broker listens to port 8080.
---
 bin/x2gobroker   |    2 +-
 debian/changelog |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/x2gobroker b/bin/x2gobroker
index 0080fbe..e1f89d7 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -238,7 +238,7 @@ if __name__ == "__main__":
                 if not daemon_logdir.endswith('/'):
                     daemon_logdir += '/'
 
-        bind_address, bind_port = x2gobroker.utils.split_host_address(cmdline_args.bind, default_address="0.0.0.0")
+        bind_address, bind_port = x2gobroker.utils.split_host_address(cmdline_args.bind, default_address="0.0.0.0:8080")
         cmdline_args.bind = "[{address}]:{port}".format(address=bind_address, port=bind_port)
 
 urls = ()
diff --git a/debian/changelog b/debian/changelog
index 0ecf46b..1cb02b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -167,6 +167,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
       don't try to strip off the domain name.
     - Consolidate x2gobroker.utils.split_host_address() with a test and rewrite
       completely.
+    - Make sure that without configuration files, the HTTP broker listens to
+      port 8080.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git