From bf61a864294dfd8e0bb1cc415e5213d2e5552da6 Mon Sep 17 00:00:00 2001
From: Nicolas Wavrant <nicolas.wavrant@tiolive.com>
Date: Mon, 11 Nov 2013 12:18:56 +0100
Subject: [PATCH] slaprunner: fix in publication of shellinabox password for
 resiliency

Conflicts:
	software/slaprunner/common.cfg
---
 software/slaprunner/common.cfg                    | 2 +-
 software/slaprunner/instance-resilient.cfg.jinja2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg
index 5e1b386fc..74e0f8e0e 100644
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -112,7 +112,7 @@ mode = 0644
 [template-resilient]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = ed9040fe86e54c7b39baa3084c03bcd2
+md5sum = b487329292b035e1b1b19ac2dc72f690
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 
diff --git a/software/slaprunner/instance-resilient.cfg.jinja2 b/software/slaprunner/instance-resilient.cfg.jinja2
index 448543fc5..2018831dd 100644
--- a/software/slaprunner/instance-resilient.cfg.jinja2
+++ b/software/slaprunner/instance-resilient.cfg.jinja2
@@ -28,7 +28,7 @@ cloud9_url = ${request-runner:connection-cloud9_url}
 cloud9_backend_url = ${request-runner:connection-cloud9_backend_url}
 ssh_command = ${request-runner:connection-ssh_command}
 password_recovery_code = ${request-runner:connection-password_recovery_code}
-shell_password = ${request-runner:shell_password}
+shell_password = ${request-runner:connection-shell_password}
 
 [slap-parameter]
 # Default parameters for distributed deployment
-- 
2.30.9