diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index 1e6ed6e38d94f0424b34d9648212cdb4850aad94..c485a1bdca6f7b47bf6ee838d0229f358f544f9c 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -40,7 +40,7 @@ run = $${:var}/run/ backup = $${:srv}/backup/ promises = $${:etc}/promise/ test = $${:etc}/test/ -nginx-data = $${rootdirectory:srv}/nginx +nginx-data = $${directory:srv}/nginx ca-dir = $${:srv}/ssl @@ -187,7 +187,7 @@ path_tmp = $${buildout:directory}/tmp path_nginx_conf = $${directory:etc}/nginx.conf # Executables bin_nginx = ${nginx:location}/sbin/nginx -bin_launcher = $${directory:services}/launcher +bin_launcher = $${directory:bin}/launcher # Utils path_shell = ${dash:location}/bin/dash @@ -237,8 +237,8 @@ crl = $${directory:ca-dir}/crl/ recipe = slapos.cookbook:certificate_authority.request key-file = $${cadirectory:certs}/nginx_frontend.key cert-file = $${cadirectory:certs}/nginx_frontend.crt -executable = $${directory:services}/launcher -wrapper = $${directory:services}/ca-launcher +executable = $${nginx-launcher:rendered} +wrapper = $${directory:services}/nginx-frontend # Put domain name name = example.com @@ -263,9 +263,10 @@ return = site_url #-- Send informations to SlapOS Master [publish-connection-informations] recipe = slapos.cookbook:publish +1_info = Set your passord in slaprunner in order to access cloud9 backend_url = $${slaprunner:access-url} url = $${request-frontend:connection-site_url} -cloud9_url = $${cloud9:access-url} +cloud9_url = https://[$${nginx-frontend:ip}]:$${nginx-frontend:port} ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:port} password_recovery_code = $${recovery-code:passwd}