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
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
194b0189
Commit
194b0189
authored
3 years ago
by
Lisa Casino
Committed by
Xavier Thompson
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/html5as-base: add graceful restart
nginx port is a parameter
parent
701f7f26
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
4 deletions
+30
-4
software/html5as-base/buildout.hash.cfg
software/html5as-base/buildout.hash.cfg
+6
-2
software/html5as-base/instance.cfg.in
software/html5as-base/instance.cfg.in
+3
-1
software/html5as-base/instance_html5as.cfg.in
software/html5as-base/instance_html5as.cfg.in
+11
-1
software/html5as-base/software.cfg
software/html5as-base/software.cfg
+4
-0
software/html5as-base/templates/graceful.in
software/html5as-base/templates/graceful.in
+6
-0
No files found.
software/html5as-base/buildout.hash.cfg
View file @
194b0189
...
@@ -17,11 +17,11 @@
...
@@ -17,11 +17,11 @@
[template-cfg]
[template-cfg]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
a91336fabd9f8e8eeb06bb14359f924b
md5sum =
3f3154ed26292387489c510efd0979a5
[instance_html5as]
[instance_html5as]
_update_hash_filename_ = instance_html5as.cfg.in
_update_hash_filename_ = instance_html5as.cfg.in
md5sum =
1701ea8a81d2c5cd4aaeec029a67b3fa
md5sum =
db5f024c0b278d6e8a33cde420908073
[template_nginx_conf]
[template_nginx_conf]
_update_hash_filename_ = templates/nginx_conf.in
_update_hash_filename_ = templates/nginx_conf.in
...
@@ -38,3 +38,7 @@ md5sum = 4ef94a7b458d885cd79ba0b930a5727e
...
@@ -38,3 +38,7 @@ md5sum = 4ef94a7b458d885cd79ba0b930a5727e
[template_index_html]
[template_index_html]
_update_hash_filename_ = templates/index.html.in
_update_hash_filename_ = templates/index.html.in
md5sum = d57cb01df5941e139b02a2f7bdabcdc8
md5sum = d57cb01df5941e139b02a2f7bdabcdc8
[template_graceful]
_update_hash_filename_ = templates/graceful.in
md5sum = 1c0ee16966e1fcdb3fd11c09f12ee2b2
This diff is collapsed.
Click to expand it.
software/html5as-base/instance.cfg.in
View file @
194b0189
...
@@ -15,6 +15,7 @@ template_nginx_conf = {{ template_nginx_conf_target }}
...
@@ -15,6 +15,7 @@ template_nginx_conf = {{ template_nginx_conf_target }}
template_mime_types = {{ template_mime_types_target }}
template_mime_types = {{ template_mime_types_target }}
template_launcher = {{ template_launcher_target }}
template_launcher = {{ template_launcher_target }}
template_index_html = {{ template_index_html_target }}
template_index_html = {{ template_index_html_target }}
template_graceful = {{ template_graceful_target }}
[instance-html5as]
[instance-html5as]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -32,7 +33,8 @@ context =
...
@@ -32,7 +33,8 @@ context =
default-parameters =
default-parameters =
{
{
"title": "Tutorial html5as",
"title": "Tutorial html5as",
"download_url": ""
"download_url": "",
"port": 8081
}
}
[switch-softwaretype]
[switch-softwaretype]
...
...
This diff is collapsed.
Click to expand it.
software/html5as-base/instance_html5as.cfg.in
View file @
194b0189
...
@@ -13,6 +13,7 @@ parts =
...
@@ -13,6 +13,7 @@ parts =
downloader
downloader
mime_types
mime_types
launcher
launcher
nginx-graceful
publish-connection-information
publish-connection-information
# Define egg directories to be the one from Software Release
# Define egg directories to be the one from Software Release
...
@@ -75,7 +76,7 @@ nb_workers = 2
...
@@ -75,7 +76,7 @@ nb_workers = 2
# Network
# Network
ip = {{ partition_ipv6 }}
ip = {{ partition_ipv6 }}
port =
8081
port =
{{ parameter_dict['port'] }}
access_url = http://[${:ip}]:${:port}
access_url = http://[${:ip}]:${:port}
# Paths
# Paths
...
@@ -154,6 +155,15 @@ title = {{ parameter_dict['title'] }}
...
@@ -154,6 +155,15 @@ title = {{ parameter_dict['title'] }}
context =
context =
key title :title
key title :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 nginx address
[publish-connection-information]
[publish-connection-information]
recipe = slapos.cookbook:publish
recipe = slapos.cookbook:publish
...
...
This diff is collapsed.
Click to expand it.
software/html5as-base/software.cfg
View file @
194b0189
...
@@ -43,6 +43,7 @@ context =
...
@@ -43,6 +43,7 @@ context =
key template_launcher_target template_launcher:target
key template_launcher_target template_launcher:target
key template_instance_html5as_target instance_html5as:target
key template_instance_html5as_target instance_html5as:target
key template_index_html_target template_index_html:target
key template_index_html_target template_index_html:target
key template_graceful_target template_graceful:target
[download-base]
[download-base]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
...
@@ -66,6 +67,9 @@ mode = 0644
...
@@ -66,6 +67,9 @@ mode = 0644
[template_index_html]
[template_index_html]
<= download-base
<= download-base
[template_graceful]
<= download-base
[extra-eggs]
[extra-eggs]
recipe = zc.recipe.egg
recipe = zc.recipe.egg
eggs =
eggs =
...
...
This diff is collapsed.
Click to expand it.
software/html5as-base/templates/graceful.in
0 → 100644
View file @
194b0189
#! {{ 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'] }})
This diff is collapsed.
Click to expand it.
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