Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Cédric Le Ninivin
/
slapos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Commit 4797489c
authored
2016-05-30 13:03:07 +0200
by
Cédric Le Ninivin
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
html5as: Add graceful reload
1 parent
fda026ef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletions
software/html5as/instance_html5as.cfg
software/html5as/software.cfg
software/html5as/templates/wrapper.in
software/html5as/instance_html5as.cfg
View file @
4797489
...
...
@@ -3,6 +3,7 @@ parts =
nginx_conf
downloader
launcher
nginx-graceful
mime_types
publish-connection-information
...
...
@@ -80,6 +81,7 @@ bin_downloader = $${basedirectory:services}/downloader
path_shell = ${dash:location}/bin/dash
path_curl = ${curl:location}/bin/curl
path_tar = ${tar:location}/bin/tar
nginx-graceful = kill -USR1 $(cat $${:path_pid})
[nginx_conf]
recipe = slapos.recipe.template:jinja2
...
...
@@ -111,6 +113,15 @@ mode = 700
context =
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]
recipe = slapos.cookbook:publish
server_url = http://[$${html5as:ip}]:$${html5as:port}
...
...
software/html5as/software.cfg
View file @
4797489
...
...
@@ -31,7 +31,7 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg
md5sum =
91d6e7fc3465d0eba1d7dfe9ebb03206
md5sum =
450fd933137a4e193c7647ce75b0a2f0
mode = 0644
[template_nginx_conf]
...
...
@@ -66,6 +66,13 @@ filename = mime_types.in
mode = 0644
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]
apache-libcloud = 0.12.3
async = 0.6.1
...
...
software/html5as/templates/wrapper.in
0 → 100644
View file @
4797489
#!${dash-output:dash}
{{ content }}
\ No newline at end of file
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment