This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 806224f Update copyright holders. Copyright is held only by people who actually contributed to the current code base. new 67d9cfd debian/*.postinst: Assure that the log directory always exists (no matter what combination of packages got installed). new 8747a01 Use physical host address and port (if provided) for contacting remote broker agent via SSH. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 +++++ debian/x2gobroker-agent.postinst | 1 + debian/x2gobroker-authservice.postinst | 3 +++ debian/x2gobroker-daemon.postinst | 1 + debian/x2gobroker-ssh.postinst | 1 + debian/x2gobroker-wsgi.postinst | 1 + x2gobroker/brokers/base_broker.py | 5 +++++ 7 files changed, 17 insertions(+) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 67d9cfd0ba235c919af84aa9b0d647d0e8a47968 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 12 01:29:14 2014 +0200 debian/*.postinst: Assure that the log directory always exists (no matter what combination of packages got installed). --- debian/changelog | 3 +++ debian/x2gobroker-agent.postinst | 1 + debian/x2gobroker-authservice.postinst | 3 +++ debian/x2gobroker-daemon.postinst | 1 + debian/x2gobroker-ssh.postinst | 1 + debian/x2gobroker-wsgi.postinst | 1 + 6 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 999965b..b773391 100644 --- a/debian/changelog +++ b/debian/changelog @@ -173,6 +173,9 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low Apache2.4 / Apache2.2. + On package purgal: Disable Apache2 config first and then attempt the removal of the x2gobroker user/group. + * debian/*.postinst: + + Assure that the log directory always exists (no matter what combination + of packages got installed). * debian/source/format: + Switch to format 1.0. * rpm/*.init: diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst index a6fd79d..35c7097 100755 --- a/debian/x2gobroker-agent.postinst +++ b/debian/x2gobroker-agent.postinst @@ -56,6 +56,7 @@ case "$1" in if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent 1>/dev/null; then dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent fi + mkdir -p /var/log/x2gobroker && chown x2gobroker:adm /var/log/x2gobroker && chmod 2755 /var/log/x2gobroker touch /var/log/x2gobroker/broker.log && chown x2gobroker:adm /var/log/x2gobroker/broker.log touch /var/log/x2gobroker/error.log && chown x2gobroker:adm /var/log/x2gobroker/error.log diff --git a/debian/x2gobroker-authservice.postinst b/debian/x2gobroker-authservice.postinst index 52be4f9..dc881b4 100755 --- a/debian/x2gobroker-authservice.postinst +++ b/debian/x2gobroker-authservice.postinst @@ -54,6 +54,9 @@ case "$1" in dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker fi + mkdir -p /var/log/x2gobroker && chown x2gobroker:adm /var/log/x2gobroker && chmod 2755 /var/log/x2gobroker + touch /var/log/x2gobroker/authservice.log && chown x2gobroker:adm /var/log/x2gobroker/authservice.log + touch /var/log/x2gobroker/error.log && chown x2gobroker:adm /var/log/x2gobroker/error.log ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst index 95c4475..6d55330 100755 --- a/debian/x2gobroker-daemon.postinst +++ b/debian/x2gobroker-daemon.postinst @@ -53,6 +53,7 @@ case "$1" in if ! dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker fi + mkdir -p /var/log/x2gobroker && chown x2gobroker:adm /var/log/x2gobroker && chmod 2755 /var/log/x2gobroker touch /var/log/x2gobroker/access.log && chown x2gobroker:adm /var/log/x2gobroker/access.log touch /var/log/x2gobroker/broker.log && chown x2gobroker:adm /var/log/x2gobroker/broker.log touch /var/log/x2gobroker/error.log && chown x2gobroker:adm /var/log/x2gobroker/error.log diff --git a/debian/x2gobroker-ssh.postinst b/debian/x2gobroker-ssh.postinst index 343a43c..6631767 100755 --- a/debian/x2gobroker-ssh.postinst +++ b/debian/x2gobroker-ssh.postinst @@ -101,6 +101,7 @@ case "$1" in chmod 0755 /usr/bin/x2gobroker-ssh fi + mkdir -p /var/log/x2gobroker && chown x2gobroker:adm /var/log/x2gobroker && chmod 2750 /var/log/x2gobroker touch /var/log/x2gobroker/broker.log && chown x2gobroker:adm /var/log/x2gobroker/broker.log touch /var/log/x2gobroker/error.log && chown x2gobroker:adm /var/log/x2gobroker/error.log diff --git a/debian/x2gobroker-wsgi.postinst b/debian/x2gobroker-wsgi.postinst index 2da0c9b..c0b0c8a 100755 --- a/debian/x2gobroker-wsgi.postinst +++ b/debian/x2gobroker-wsgi.postinst @@ -72,6 +72,7 @@ case "$1" in if ! dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker fi + mkdir -p /var/log/x2gobroker && chown x2gobroker:adm /var/log/x2gobroker && chmod 2755 /var/log/x2gobroker touch /var/log/x2gobroker/broker.log && chown x2gobroker:adm /var/log/x2gobroker/broker.log touch /var/log/x2gobroker/error.log && chown x2gobroker:adm /var/log/x2gobroker/error.log touch /var/log/x2gobroker/wsgi.log && chown x2gobroker:adm /var/log/x2gobroker/wsgi.log -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 8747a0154e0d5641759bf88e89b17386eee30f19 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 12 08:49:03 2014 +0200 Use physical host address and port (if provided) for contacting remote broker agent via SSH. --- debian/changelog | 2 ++ x2gobroker/brokers/base_broker.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index b773391..d21d8e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -157,6 +157,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low instances or hosts behind a reverse NATed IPv4 gateway). This ended up in a rewrite of the complete selection_session() method of the base broker code. + - Use physical host address and port (if provided) for contacting + remote broker agent via SSH. - Update README and TODO. - Update copyright holders. Copyright is held only by people who actually contributed to the current code base. diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 928550b..d23accd 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -960,6 +960,11 @@ class X2GoBroker(object): remote_agent_server = server_list[-1] remote_agent_port = profile[u'sshport'] + if profile.has_key('host={ras}'.format(ras=remote_agent_server): + remote_agent_server = profile["host={ras}".format(ras=remote_agent_server)] + if profile.has_key('sshport={rap}'.format(ras=remote_agent_port): + remote_agent_port = profile["host={rap}".format(ras=remote_agent_port)] + remote_agent = {u'hostname': remote_agent_server, u'port': remote_agent_port, } try: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org