Commit e97d8500 authored by Nicolas Wavrant's avatar Nicolas Wavrant

resilient: get slapuser from slap-configuration instead of environment

parent 123c7e2a
......@@ -41,7 +41,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/pbsready.cfg.in
output = ${buildout:directory}/pbsready.cfg
md5sum = 28590ed58034cd5228e7f2cb2e79df94
md5sum = 1e1bb90f4a919bbceb1a81ae2a1452a1
mode = 0644
[pbsready-import]
......
......@@ -261,9 +261,6 @@ input = inline:#!${bash:location}/bin/bash
output = $${basedirectory:promises}/public-key-existence
mode = 700
[environment]
recipe = collective.recipe.environment
#----------------
#--
#-- Connection informations to re-use.
......@@ -271,5 +268,5 @@ recipe = collective.recipe.environment
[resilient-publish-connection-parameter]
recipe = slapos.cookbook:publish
ssh-public-key = $${sshkeys-sshd:public-key-value}
ssh-url = ssh://$${environment:USER}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
ssh-url = ssh://$${slap-configuration:slapuser}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path}
ip = $${slap-network-information:global-ipv6}
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