Commit 123c7e2a authored by Nicolas Wavrant's avatar Nicolas Wavrant

slupranner: gets user from slap-configuration instead of environment

parent fd5f808b
......@@ -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 = f82470af9aaace356579d1a182a9c65b
md5sum = b3f284ef5b3c60bf4b6a90d4b3116d4c
mode = 0644
[template-runner-import-script]
......
......@@ -534,7 +534,7 @@ recipe = slapos.cookbook:publish
backend-url = $${slaprunner:access-url}
init-user = $${runner-htpasswd:user}
init-password = $${runner-htpasswd:password}
ssh-command = ssh $${environ:USER}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port}
ssh-command = ssh $${slap-configuration:slapuser}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port}
git-public-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/
git-private-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/
monitor-base-url = $${publish:monitor-base-url}
......
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