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

software/nginx-push-stream/buildout.hash.cfg

@@ -2,14 +2,10 @@
 filename = instance.cfg.in
 md5sum = eb4c69df9a8dbb94fb76d0a6c11e360f
 
-[template-nginx-service]
-filename = template-nginx-service.sh.in
-md5sum = 49da09608a6439fb8e1e33c286ac6c36
-
 [template-nginx-configuration]
 filename = template-nginx.cfg.in
 md5sum = f5658154b82282bc1871f18ddf4529d8
 
 [template-nginx]
 filename = instance-nginx.cfg.in
-md5sum = 936fea88f5548c4f14e287f1b27dc127
+md5sum = ae50345b1c72db78ada8f36bbe91643b

software/nginx-push-stream/instance-nginx.cfg.in

@@ -27,12 +27,10 @@ ssl = $${:etc}/ssl
 # Nginx service
 #################################
 [nginx-service]
-recipe = slapos.recipe.template
-url = ${template-nginx-service:output}
-output = $${directory:services}/nginx
-mode = 0700
-virtual-depends =
-  $${nginx-configuration:ip}
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${directory:services}/nginx
+command-line =
+  ${nginx-push-stream-output:nginx} -c $${nginx-configuration:output}
 
 [nginx-configuration]
 recipe = slapos.recipe.template

software/nginx-push-stream/software.cfg

@@ -11,7 +11,6 @@ parts =
   nginx-push-stream-module
   nginx-push-stream
   template
-  template-nginx-service
   template-nginx
 
 [template]
@@ -20,12 +19,6 @@ url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/template.cfg
 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]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}

software/nginx-push-stream/template-nginx-service.sh.in

-#!${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}