Commit e497f008 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

html5as: Add graceful restart, nginx port is a parameter

parent da884fa8
......@@ -17,11 +17,11 @@
[template-cfg]
filename = instance.cfg.in
md5sum = 9b8dd44e9a802648840a7116dea05b95
md5sum = c52c8507608873e03b7a414112d81e91
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
md5sum = ea736fd96ca62b388e036ae6dbaeb73d
md5sum = 54fb9fac7a171fdc1300308116e8b224
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
......@@ -38,3 +38,7 @@ md5sum = 4ef94a7b458d885cd79ba0b930a5727e
[template_index_html]
_update_hash_filename_ = templates/index.html.in
md5sum = d57cb01df5941e139b02a2f7bdabcdc8
[template_graceful]
_update_hash_filename_ = templates/graceful.in
md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2
......@@ -15,6 +15,7 @@ template_nginx_conf = {{ template_nginx_conf_target }}
template_mime_types = {{ template_mime_types_target }}
template_launcher = {{ template_launcher_target }}
template_index_html = {{ template_index_html_target }}
template_graceful = {{ template_graceful_target }}
[instance-html5as]
recipe = slapos.recipe.template:jinja2
......
......@@ -9,6 +9,7 @@ parts =
downloader
mime_types
launcher
nginx-graceful
publish-connection-information
# Define egg directories to be the one from Software Release
......@@ -71,7 +72,7 @@ nb_workers = 2
# Network
ip = ${slap-network-information:global-ipv6}
port = 8081
port = ${slap-parameter:port}
access_url = http://[${:ip}]:${:port}
# Paths
......@@ -147,6 +148,15 @@ rendered = ${directory:srv}/index.html
context =
key title slap-parameter:title
### Nginx Graceful
[nginx-graceful]
recipe = slapos.recipe.template:jinja2
template = {{ parameter_list['template_graceful'] }}
rendered = ${basedirectory:script}/nginx-graceful
mode = 0700
context =
section param_html5as html5as
# Publish nginx address
[publish-connection-information]
recipe = slapos.cookbook:publish
......@@ -156,3 +166,4 @@ title = Title ${slap-parameter:title}!
[slap-parameter]
title =
download_url =
port = 8081
......@@ -41,6 +41,7 @@ context =
key template_launcher_target template_launcher:target
key template_instance_html5as_target instance_html5as:target
key template_index_html_target template_index_html:target
key template_graceful_target template_graceful:target
# Have one shared section to define the default behaviour to download
# templates. Sections inheriting from this one won't need to redefine
......@@ -68,6 +69,9 @@ mode = 0644
[template_index_html]
<= download-base
[template_graceful]
<= download-base
# Pin versions of eggs used that are not already pinned by stack/slapos.cfg
[versions]
slapos.recipe.template = 4.4
#! {{ param_html5as['path_shell'] }}
# BEWARE: This file is operated by slapos node
# BEWARE: It will be overwritten automatically
# Run graceful
exec kill -s SIGHUP $(cat {{ param_html5as['path_pid'] }})
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