Commit 0d4f4011 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

slaprunner: launcher for nginx with ssl certificate, parameters for default sr, bug fix

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