From a4f554099bb0aa73e129fa293ca455c0611cc912 Mon Sep 17 00:00:00 2001
From: Nicolas Wavrant <nicolas.wavrant@nexedi.com>
Date: Thu, 8 Sep 2016 15:31:49 +0200
Subject: [PATCH] runner: ssh folder used in resiliency shouldn't be backed up
When it is restored on importer instance, it erases its RSA key... Which makes the sshd service to crash
---
software/slaprunner/common.cfg | 4 ++--
software/slaprunner/template/runner-export.sh.jinja2 | 2 +-
software/slaprunner/template/runner-import.sh.jinja2 | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg
index cbb8fbcef..ec6ebdbf4 100644
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -62,7 +62,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/template/runner-import.sh.jinja2
download-only = true
-md5sum = ee0b5023273e92c0c7a4ebf1868f50d5
+md5sum = d3ce78b35cb47dcb647772891a1bf814
filename = runner-import.sh.jinja2
mode = 0644
@@ -78,7 +78,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/template/runner-export.sh.jinja2
download-only = true
-md5sum = 491fb665bf5a5a2dc80bf912aee1a844
+md5sum = c56fed583e78d6e434d5709b099bc34f
filename = runner-export.sh.jinja2
mode = 0644
diff --git a/software/slaprunner/template/runner-export.sh.jinja2 b/software/slaprunner/template/runner-export.sh.jinja2
index 84ebc80eb..c85eac789 100644
--- a/software/slaprunner/template/runner-export.sh.jinja2
+++ b/software/slaprunner/template/runner-export.sh.jinja2
@@ -54,7 +54,7 @@ sync_element $srv_directory/runner {{ directory['backup'] }}/runner/ instance pr
# We sync .* appart
date +%s -u > {{ directory['etc'] }}/.resilient-timestamp
cp -r {{ directory['etc'] }}/.??* {{ directory['backup'] }}/etc/
-sync_element {{ directory['etc'] }} {{ directory['backup'] }}/etc/ config.json ssh
+sync_element {{ directory['etc'] }} {{ directory['backup'] }}/etc/ config.json
if [ -d {{ directory['backup'] }}/runner/software ]; then
rm {{ directory['backup'] }}/runner/software/*
fi
diff --git a/software/slaprunner/template/runner-import.sh.jinja2 b/software/slaprunner/template/runner-import.sh.jinja2
index d8a06d5df..b3424b22f 100644
--- a/software/slaprunner/template/runner-import.sh.jinja2
+++ b/software/slaprunner/template/runner-import.sh.jinja2
@@ -28,7 +28,7 @@ restore_element () {
}
restore_element {{ directory['backup'] }}/runner/ $srv_directory/runner instance project proxy.db
-restore_element {{ directory['backup'] }}/etc/ {{ directory['etc'] }} config.json ssh
+restore_element {{ directory['backup'] }}/etc/ {{ directory['etc'] }} config.json
cp -r {{ directory['backup'] }}/etc/.??* {{ directory['etc'] }};
--
2.30.9