Commit 4797489c authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

html5as: Add graceful reload

parent fda026ef
...@@ -3,6 +3,7 @@ parts = ...@@ -3,6 +3,7 @@ parts =
nginx_conf nginx_conf
downloader downloader
launcher launcher
nginx-graceful
mime_types mime_types
publish-connection-information publish-connection-information
...@@ -80,6 +81,7 @@ bin_downloader = $${basedirectory:services}/downloader ...@@ -80,6 +81,7 @@ bin_downloader = $${basedirectory:services}/downloader
path_shell = ${dash:location}/bin/dash path_shell = ${dash:location}/bin/dash
path_curl = ${curl:location}/bin/curl path_curl = ${curl:location}/bin/curl
path_tar = ${tar:location}/bin/tar path_tar = ${tar:location}/bin/tar
nginx-graceful = kill -USR1 $(cat $${:path_pid})
[nginx_conf] [nginx_conf]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -111,6 +113,15 @@ mode = 700 ...@@ -111,6 +113,15 @@ mode = 700
context = context =
section param_html5as html5as section param_html5as html5as
### Nginx Graceful
[nginx-graceful]
recipe = slapos.recipe.template:jinja2
template = ${template-wrapper:output}
rendered = $${basedirectory:services}/nginx-graceful
mode = 0700
context =
key content html5as:nginx-graceful
[publish-connection-information] [publish-connection-information]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
server_url = http://[$${html5as:ip}]:$${html5as:port} server_url = http://[$${html5as:ip}]:$${html5as:port}
......
...@@ -31,7 +31,7 @@ mode = 0644 ...@@ -31,7 +31,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance_html5as.cfg url = ${:_profile_base_location_}/instance_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg output = ${buildout:directory}/template_html5as.cfg
md5sum = 91d6e7fc3465d0eba1d7dfe9ebb03206 md5sum = 450fd933137a4e193c7647ce75b0a2f0
mode = 0644 mode = 0644
[template_nginx_conf] [template_nginx_conf]
...@@ -66,6 +66,13 @@ filename = mime_types.in ...@@ -66,6 +66,13 @@ filename = mime_types.in
mode = 0644 mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template-wrapper]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/templates/wrapper.in
output = ${buildout:directory}/template-wrapper.cfg
mode = 0644
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
[versions] [versions]
apache-libcloud = 0.12.3 apache-libcloud = 0.12.3
async = 0.6.1 async = 0.6.1
......
#!${dash-output:dash}
{{ content }}
\ No newline at end of file
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