Commit 241a3bb4 authored by Jérome Perrin's avatar Jérome Perrin

software/nginx-push-stream: simplify by using slapos.cookbook:wrapper

parent 1e3d0810
...@@ -2,14 +2,10 @@ ...@@ -2,14 +2,10 @@
filename = instance.cfg.in filename = instance.cfg.in
md5sum = eb4c69df9a8dbb94fb76d0a6c11e360f md5sum = eb4c69df9a8dbb94fb76d0a6c11e360f
[template-nginx-service]
filename = template-nginx-service.sh.in
md5sum = 49da09608a6439fb8e1e33c286ac6c36
[template-nginx-configuration] [template-nginx-configuration]
filename = template-nginx.cfg.in filename = template-nginx.cfg.in
md5sum = f5658154b82282bc1871f18ddf4529d8 md5sum = f5658154b82282bc1871f18ddf4529d8
[template-nginx] [template-nginx]
filename = instance-nginx.cfg.in filename = instance-nginx.cfg.in
md5sum = 936fea88f5548c4f14e287f1b27dc127 md5sum = ae50345b1c72db78ada8f36bbe91643b
...@@ -27,12 +27,10 @@ ssl = $${:etc}/ssl ...@@ -27,12 +27,10 @@ ssl = $${:etc}/ssl
# Nginx service # Nginx service
################################# #################################
[nginx-service] [nginx-service]
recipe = slapos.recipe.template recipe = slapos.cookbook:wrapper
url = ${template-nginx-service:output} wrapper-path = $${directory:services}/nginx
output = $${directory:services}/nginx command-line =
mode = 0700 ${nginx-push-stream-output:nginx} -c $${nginx-configuration:output}
virtual-depends =
$${nginx-configuration:ip}
[nginx-configuration] [nginx-configuration]
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
[buildout] [buildout]
extends = extends =
../../stack/slapos.cfg ../../stack/slapos.cfg
../../component/dash/buildout.cfg
../../component/nginx/buildout.cfg ../../component/nginx/buildout.cfg
./buildout.hash.cfg ./buildout.hash.cfg
...@@ -11,7 +10,6 @@ parts = ...@@ -11,7 +10,6 @@ parts =
nginx-push-stream-module nginx-push-stream-module
nginx-push-stream nginx-push-stream
template template
template-nginx-service
template-nginx template-nginx
[template] [template]
...@@ -20,12 +18,6 @@ url = ${:_profile_base_location_}/instance.cfg.in ...@@ -20,12 +18,6 @@ url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/template.cfg output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[template-nginx-service]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/template-nginx-service.sh.in
mode = 0644
[template-nginx-configuration] [template-nginx-configuration]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
......
#!${dash-output:dash}
# BEWARE: This file is operated by slapos node
# BEWARE: It will be overwritten automatically
exec ${nginx-push-stream-output:nginx} \
-c $${nginx-configuration:output}
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