Commit 0f441e98 authored by Nicolas Wavrant's avatar Nicolas Wavrant

resilient & slaprunner: force the upgrade of openssh keys

parent bdf529da
......@@ -54,7 +54,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in
md5sum = 26a58e69c4c59d30c9e2f50075cdc679
md5sum = 71ce5a39bf61ae5f80a10c27b9c12761
mode = 0644
[template-runner-import-script]
......
......@@ -251,16 +251,16 @@ recipe = slapos.cookbook:wrapper
command-line = $${directory:bin}/killpidfromfile $${runner-sshd-config:path_pid} SIGHUP
wrapper-path = $${directory:scripts}/runner-sshd-graceful
[sshkeys-directory]
[runner-sshkeys-directory]
recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests/
keys = $${directory:sshkeys}/keys/
requests = $${directory:sshkeys}/runner-requests/
keys = $${directory:sshkeys}/runner-keys/
[runner-sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority
request-directory = $${sshkeys-directory:requests}
keys-directory = $${sshkeys-directory:keys}
wrapper = $${directory:services}/sshkeys_authority
request-directory = $${runner-sshkeys-directory:requests}
keys-directory = $${runner-sshkeys-directory:keys}
wrapper = $${directory:services}/runner_sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen
[runner-sshkeys-sshd]
......
......@@ -41,7 +41,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
md5sum = fee06ab268015b394ec49cb4600de1ed
md5sum = 3dddf84daf5db8ff4ffc3878e206b467
mode = 0644
[pbsready-import]
......@@ -50,7 +50,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-import.cfg.in
output = ${buildout:directory}/pbsready-import.cfg
md5sum = 89619b0d8626c76402a11bb08e7ba8a1
md5sum = a13be3bd76d6a52b6527c7035ba33a06
mode = 0644
[pbsready-export]
......@@ -59,7 +59,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready-export.cfg.in
output = ${buildout:directory}/pbsready-export.cfg
md5sum = 48cf26431ab052eae8227efd457db8c3
md5sum = cb2537598981a1a4af0dea05cc6ac6bd
mode = 0644
[template-pull-backup]
......
......@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-sshkeys-authority
sshd-raw-server
sshd-graceful
sshkeys-sshd
......
......@@ -10,7 +10,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-sshkeys-authority
sshd-raw-server
sshd-graceful
sshkeys-sshd
......
......@@ -6,7 +6,7 @@ parts =
logrotate-entry-equeue
cron
cron-entry-logrotate
sshkeys-authority
resilient-sshkeys-authority
sshd-graceful
sshkeys-sshd
sshd-promise
......@@ -229,18 +229,18 @@ port = $${sshd-port:port}
[sshkeys-directory]
recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests
keys = $${directory:sshkeys}/keys
requests = $${directory:sshkeys}/resilient-requests
keys = $${directory:sshkeys}/resilient-keys
[sshkeys-authority]
[resilient-sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority
request-directory = $${sshkeys-directory:requests}
keys-directory = $${sshkeys-directory:keys}
wrapper = $${basedirectory:services}/sshkeys_authority
wrapper = $${basedirectory:services}/resilient_sshkeys_authority
keygen-binary = ${openssh:location}/bin/ssh-keygen
[sshkeys-sshd]
<= sshkeys-authority
<= resilient-sshkeys-authority
recipe = slapos.cookbook:sshkeys_authority.request
name = sshd
type = rsa
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment