Commit 7e9faa7b authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

html5as: fix instanciation inside a runner

parent 873f9452
...@@ -56,7 +56,7 @@ nb_workers = 2 ...@@ -56,7 +56,7 @@ nb_workers = 2
# Network # Network
ip = $${slap-network-information:global-ipv6} ip = $${slap-network-information:global-ipv6}
port = 8080 port = 8081
# Paths # Paths
# Log # Log
......
...@@ -31,13 +31,13 @@ mode = 0644 ...@@ -31,13 +31,13 @@ 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 = 579eceb768e8d25fb53338fc4fac6944 md5sum = 41cb6178f760238ca276854873ef9364
mode = 0644 mode = 0644
[template_nginx_conf] [template_nginx_conf]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/nginx_conf.in url = ${:_profile_base_location_}/templates/nginx_conf.in
md5sum = 0ae1fb1c777c332d76f680c681a4f48a md5sum = 61dc4c82bf48563228ce4dea6c5c6319
filename = nginx_conf.in filename = nginx_conf.in
mode = 0644 mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
...@@ -53,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -53,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template_downloader] [template_downloader]
recipe = slapos.recipe.download recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/downloader.in url = ${:_profile_base_location_}/templates/downloader.in
md5sum = 7b374a03f4086fcae47491d449da1f09 md5sum = 9779e2db6c73d282f802b3407b390ede
filename = downloader.in filename = downloader.in
mode = 0644 mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
rm -r {{ param_html5as['docroot'] }}/* rm -r {{ param_html5as['docroot'] }}/*
# Download and extract website tarball into docroot directory # Download and extract website tarball into docroot directory
exec {{ param_html5as['path_curl'] }} -s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }} exec {{ param_html5as['path_curl'] }} -ks {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}
...@@ -13,6 +13,7 @@ events { ...@@ -13,6 +13,7 @@ events {
http { http {
include {{ param_html5as['path_mime_types'] }}; include {{ param_html5as['path_mime_types'] }};
default_type application/octet-stream; default_type application/octet-stream;
types_hash_bucket_size 64;
access_log {{ param_html5as['path_access_log'] }} combined; access_log {{ param_html5as['path_access_log'] }} combined;
index index.html; index index.html;
......
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