From 49eccd6af627a91bfe10410b6f3cc352a5efd30b Mon Sep 17 00:00:00 2001 From: Alain Takoudjou Date: Wed, 21 Sep 2016 17:24:34 +0200 Subject: [PATCH] resilient: force regeneration (on upgrade) of ssh certificate of pbs instance --- stack/resilient/buildout.cfg | 2 +- stack/resilient/instance-pull-backup.cfg.in | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg index c98ec5ed2..0969aa057 100644 --- a/stack/resilient/buildout.cfg +++ b/stack/resilient/buildout.cfg @@ -66,7 +66,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-pull-backup.cfg.in output = ${buildout:directory}/instance-pull-backup.cfg -md5sum = 683d178a7ebb60b949d638120dce19ca +md5sum = 3892f86fcf850511dc0e6e4983b1961a mode = 0644 [template-replicated] diff --git a/stack/resilient/instance-pull-backup.cfg.in b/stack/resilient/instance-pull-backup.cfg.in index fe7df6d2e..6b6ef7ce9 100644 --- a/stack/resilient/instance-pull-backup.cfg.in +++ b/stack/resilient/instance-pull-backup.cfg.in @@ -32,7 +32,6 @@ offline = true [rootdirectory] recipe = slapos.cookbook:mkdirectory etc = $${buildout:directory}/etc -home = $${buildout:directory}/home srv = $${buildout:directory}/srv bin = $${buildout:directory}/bin tmp = $${buildout:directory}/tmp @@ -45,7 +44,7 @@ services = $${rootdirectory:etc}/service run = $${rootdirectory:var}/run backup = $${rootdirectory:srv}/backup promises = $${rootdirectory:etc}/promise -ssh-home = $${rootdirectory:home}/ssh +ssh-home = $${rootdirectory:etc}/ssh notifier = $${rootdirectory:etc}/notifier [directory] @@ -209,8 +208,8 @@ rotate-num = 30 [sshkeys-directory] recipe = slapos.cookbook:mkdirectory -requests = $${directory:sshkeys}/requests -keys = $${directory:sshkeys}/keys +requests = $${directory:sshkeys}/openssl-requests +keys = $${directory:sshkeys}/openssl-keys [pbs-sshkeys-authority] recipe = slapos.cookbook:sshkeys_authority -- 2.25.1