From 23a523582cb2fd2f125e764946bc1ff9516ee7f7 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Thu, 20 Jun 2013 00:11:32 +0200 Subject: [PATCH 1/2] Fix bug in setting environment variables --- command_daemon/start.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 command_daemon/start.py diff --git a/command_daemon/start.py b/command_daemon/start.py old mode 100644 new mode 100755 index 5f22872..a007f42 --- a/command_daemon/start.py +++ b/command_daemon/start.py @@ -16,8 +16,8 @@ session_key = sys.argv[5] if run_command(["ssh", "%s@%s" % (user, host), "-o", "UserKnownHostsFile=/etc/cvm/knownhosts", "-o", "StrictHostKeyChecking=no", "-i", keyfile, "cd /etc/cvm/command_daemon; echo '%s' > session_key && ./command_daemon" % session_key]) == 0: # Make autossh verify the connection is still alive every 10 seconds. - os.environ["AUTOSSH_POLL"] = 10 - os.environ["AUTOSSH_FIRST_POLL"] = 10 + os.environ["AUTOSSH_POLL"] = "10" + os.environ["AUTOSSH_FIRST_POLL"] = "10" if run_command(["autossh", "-f", "-i", keyfile, "-M", str(port + 1), "-o", "UserKnownHostsFile=/etc/cvm/knownhosts", "-o", "StrictHostKeyChecking=no", "%s@%s" % (user, host), "-L", "%s:localhost:3434" % port, "-N"]) == 0: sys.stdout.write("Tunnel established.\n"); From 70c16bd33507204e37139cb57b40ef7bd439a4e2 Mon Sep 17 00:00:00 2001 From: Sven Slootweg Date: Thu, 20 Jun 2013 00:12:19 +0200 Subject: [PATCH 2/2] Rename start.py to start_tunnel.py to match name when installed --- command_daemon/{start.py => start_tunnel.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename command_daemon/{start.py => start_tunnel.py} (100%) diff --git a/command_daemon/start.py b/command_daemon/start_tunnel.py similarity index 100% rename from command_daemon/start.py rename to command_daemon/start_tunnel.py