Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
slapos
Commits
4797489c
Commit
4797489c
authored
May 30, 2016
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
html5as: Add graceful reload
parent
fda026ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
1 deletion
+21
-1
software/html5as/instance_html5as.cfg
software/html5as/instance_html5as.cfg
+11
-0
software/html5as/software.cfg
software/html5as/software.cfg
+8
-1
software/html5as/templates/wrapper.in
software/html5as/templates/wrapper.in
+2
-0
No files found.
software/html5as/instance_html5as.cfg
View file @
4797489c
...
@@ -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}
...
...
software/html5as/software.cfg
View file @
4797489c
...
@@ -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
...
...
software/html5as/templates/wrapper.in
0 → 100644
View file @
4797489c
#!${dash-output:dash}
{{ content }}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment