Commit 0098bcbc authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: gunicorn is no longer called a frontend

parent fde71ca5
...@@ -250,7 +250,7 @@ context = ...@@ -250,7 +250,7 @@ context =
key shellinabox_port shellinabox:port key shellinabox_port shellinabox:port
section param_nginx_frontend nginx-frontend section param_nginx_frontend nginx-frontend
section param_tempdir tempdirectory section param_tempdir tempdirectory
key socket gunicorn-frontend:socket key socket gunicorn:socket
[nginx-launcher] [nginx-launcher]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
...@@ -264,7 +264,7 @@ context = ...@@ -264,7 +264,7 @@ context =
#-- #--
#-- WSGI #-- WSGI
[gunicorn-frontend] [gunicorn]
bin_gunicorn = $${directory:bin}/gunicorn bin_gunicorn = $${directory:bin}/gunicorn
bin_launcher = $${directory:services}/gunicorn bin_launcher = $${directory:services}/gunicorn
path_shell = ${dash:location}/bin/dash path_shell = ${dash:location}/bin/dash
...@@ -273,14 +273,14 @@ path_pid = $${directory:run}/gunicorn.pid ...@@ -273,14 +273,14 @@ path_pid = $${directory:run}/gunicorn.pid
[gunicorn-launcher] [gunicorn-launcher]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${gunicorn-frontend:bin_gunicorn} slapos.runner:app -p $${gunicorn-frontend:path_pid} -b unix:$${gunicorn-frontend:socket} -e RUNNER_CONFIG=$${slaprunner:slapos.cfg} --preload command-line = $${gunicorn:bin_gunicorn} slapos.runner:app -p $${gunicorn:path_pid} -b unix:$${gunicorn:socket} -e RUNNER_CONFIG=$${slaprunner:slapos.cfg} --preload
wrapper-path = $${gunicorn-frontend:bin_launcher} wrapper-path = $${gunicorn:bin_launcher}
environment = PATH=$${environ:PATH} environment = PATH=$${environ:PATH}
RUNNER_CONFIG=$${slaprunner:slapos.cfg} RUNNER_CONFIG=$${slaprunner:slapos.cfg}
[gunicorn-graceful] [gunicorn-graceful]
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = $${directory:bin}/killpidfromfile $${gunicorn-frontend:path_pid} SIGHUP command-line = $${directory:bin}/killpidfromfile $${gunicorn:path_pid} SIGHUP
wrapper-path = $${directory:scripts}/gunicorn-graceful wrapper-path = $${directory:scripts}/gunicorn-graceful
#-------------------- #--------------------
......
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