x2gobroker.git - master (branch) updated: daf793b35424ee40e674221c58d0e2560f58c39d - x2go-commits

3 Dec 2012

The branch, master has been updated
       via  daf793b35424ee40e674221c58d0e2560f58c39d (commit)
      from  e77e74374b3f18f4ee272605a8352b99c9221b09 (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 daf793b35424ee40e674221c58d0e2560f58c39d
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Dec 3 14:55:12 2012 +0100

    make daemon bind address+port configurable through /etc/default/x2gobroker-daemon

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

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

The diff of changes is:

diff --git a/debian/x2gobroker-daemon.default b/debian/x2gobroker-daemon.default
index 52a89c4..084897b 100644
--- a/debian/x2gobroker-daemon.default
+++ b/debian/x2gobroker-daemon.default
@@ -1,4 +1,7 @@
 # X2Go Session Broker configuration for Debian
 
 # Uncomment to enable the X2Go Session Broker standalone daemon
-#START_DAEMON=true
\ No newline at end of file
+START_DAEMON=true
+
+# bind standalone daemon to this address:port
+#DAEMON_BIND_ADDRESS=127.0.0.1:8080
diff --git a/debian/x2gobroker-daemon.init b/debian/x2gobroker-daemon.init
index c65cca9..8a59922 100644
--- a/debian/x2gobroker-daemon.init
+++ b/debian/x2gobroker-daemon.init
@@ -26,6 +26,7 @@ DEBIANCONFIG=/etc/default/x2gobroker-daemon
 test -x "$DAEMON" || exit 0
 
 START_DAEMON=false
+DAEMON_BIND_ADDRESS=127.0.0.1:8080
 test -f $DEBIANCONFIG && . $DEBIANCONFIG
 
 . /lib/lsb/init-functions
@@ -44,7 +45,7 @@ case "${1:-}" in
       log_daemon_msg "Starting X2Go Session Broker standalone daemon" "x2gobroker"
       mkdir -p $RUNDIR
       set +e
-      start-stop-daemon -b -m -S -p $PIDFILE -x $DAEMON
+      start-stop-daemon -b -m -S -p $PIDFILE -x $DAEMON -- -b $DAEMON_BIND_ADDRESS
       log_end_msg $?
       set -e
     fi


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).

    