Commit 05ebee93 authored by Thomas Lechauve's avatar Thomas Lechauve

Create all temporary directory needed by nginx.

parent a76a671e
......@@ -30,6 +30,7 @@ recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc
var = $${buildout:directory}/var
srv = $${buildout:directory}/srv
tmp = $${buildout:directory}/tmp
[basedirectory]
recipe = slapos.cookbook:mkdirectory
......@@ -39,6 +40,14 @@ run = $${rootdirectory:var}/run
backup = $${rootdirectory:srv}/backup
data = $${rootdirectory:srv}/html5as
[tempdirectory]
recipe = slapos.cookbook:mkdirectory
client_body_temp_path = $${rootdirectory:tmp}/client_body_temp_path
proxy_temp_path = $${rootdirectory:tmp}/proxy_temp_path
fastcgi_temp_path = $${rootdirectory:tmp}/fastcgi_temp_path
uwsgi_temp_path = $${rootdirectory:tmp}/uwsgi_temp_path
scgi_temp_path = $${rootdirectory:tmp}/scgi_temp_path
[html5as]
# Options
nb_workers = 2
......@@ -66,12 +75,15 @@ bin_html5as = $${basedirectory:services}/html5as
# Utils
path_shell = ${dash:location}/bin/dash
path_curl = ${curl:location}/bin/curl
path_tar = ${tar:location}/bin/tar
[nginx_conf]
recipe = slapos.recipe.template:jinja2
template = ${template_nginx_conf:location}/${template_nginx_conf:filename}
rendered = $${html5as:path_nginx_conf}
context = section param_html5as html5as
context =
section param_html5as html5as
section param_tempdir tempdirectory
[html5as_bin]
recipe = slapos.recipe.template:jinja2
......
......@@ -7,6 +7,7 @@ extends =
../../component/nginx/buildout.cfg
../../component/curl/buildout.cfg
../../component/dash/buildout.cfg
../../component/tar/buildout.cfg
allow-hosts =
*.nexedi.org
......@@ -20,6 +21,7 @@ allow-hosts =
parts =
dash
tar
curl
nginx
eggs
......@@ -43,13 +45,13 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg
md5sum = a5f27834bce33d6c188b0d24b1455ad0
md5sum = 4e797931c1497f3d637c3695afa77977
mode = 0644
[template_nginx_conf]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/nginx_conf.in
md5sum = 6338abecda61f4414392b6f4c1d09e8a
md5sum = 6cf7acfa6ca350687d0900bf5221f0e4
filename = nginx_conf.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
......@@ -57,7 +59,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template_html5as_bin]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/html5as_bin.in
md5sum = 397c17efdadc0b226f1f08879ffcc295
md5sum = 4c5043743fd6a7f0a54eee88ea074ce2
filename = html5as_bin.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
......
......@@ -21,6 +21,11 @@ http {
server_name _;
keepalive_timeout 5;
client_body_temp_path {{ param_tempdir['client_body_temp_path'] }};
proxy_temp_path {{ param_tempdir['proxy_temp_path'] }};
fastcgi_temp_path {{ param_tempdir['fastcgi_temp_path'] }};
uwsgi_temp_path {{ param_tempdir['uwsgi_temp_path'] }};
scgi_temp_path {{ param_tempdir['scgi_temp_path'] }};
# path for static files
root {{ param_html5as['docroot'] }};
......
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