This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit cdc2493c43c84709061e0125ada5d2fff81c17f3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 20 08:30:30 2014 +0100 Fix https brokerage in x2gobroker-daemon-debug. --- debian/changelog | 1 + sbin/x2gobroker-daemon-debug | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a0812e4..2078d82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - If we received an SSH public key from a broker client, mark it as ACCEPTED after we deployed it, so that the client knows that it can its corresponding private key. + - Fix https brokerage in x2gobroker-daemon-debug. * debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + Fix SYNOPSIS texts. diff --git a/sbin/x2gobroker-daemon-debug b/sbin/x2gobroker-daemon-debug index af117ad..86225eb 100755 --- a/sbin/x2gobroker-daemon-debug +++ b/sbin/x2gobroker-daemon-debug @@ -34,6 +34,4 @@ if [ -e /etc/default/x2gobroker-daemon ]; then . /etc/default/x2gobroker-daemon fi -export X2GOBROKER_DEBUG=true - -su - x2gobroker -c "x2gobroker-daemon -M http -i $@" +su - x2gobroker -c "X2GOBROKER_SSL_CERTFILE=\"$X2GOBROKER_SSL_CERTFILE\" X2GOBROKER_SSL_KEYFILE=\"$X2GOBROKER_SSL_KEYFILE\" DAEMON_BIND_ADDRESS=\"$DAEAMON_BIND_ADDRESS\" x2gobroker-daemon -M http -b$DAEMON_BIND_ADDRESS -i $@" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git