software/headless-chromium: use slapos.cookbook:wrapper

software/headless-chromium/buildout.hash.cfg

 [template-cfg]
 filename = instance.cfg.in
-md5sum = ff048b5480605cebfbc76e9bb89ad4e9
+md5sum = 86805fd3eb34659dffe03e6114e45c56
 
 [instance-headless-chromium]
 _update_hash_filename_ = instance_headless-chromium.cfg.in
-md5sum = 4aa466bb0297baba80b39fd283922ac9
+md5sum = edb13d051635af4c906362eb7915bd13
 
 [template-chromium-launcher]
 _update_hash_filename_ = templates/launcher.in

software/headless-chromium/instance.cfg.in

@@ -7,7 +7,6 @@ develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
 offline = true
 
 [profile-common]
-dash_location = {{ dash_location }}
 nginx_location = {{ nginx_location }}
 chromium_wrapper = {{ chromium_wrapper }}
 template_launcher = {{ template_launcher_target }}

software/headless-chromium/instance_headless-chromium.cfg.in

@@ -31,20 +31,11 @@ nginx_temp_path = ${directory:tmp}
 nginx_error_log = ${directory:log}/nginx-error.log
 nginx_access_log = ${directory:log}/nginx-access.log
 
-chromium_wrapper = {{ parameter_list['chromium_wrapper'] }}
-bin_chromium_launcher = ${directory:service}/chromium
-bin_nginx_launcher = ${directory:service}/nginx
-bin_shell = {{ parameter_list['dash_location'] }}/bin/dash
-bin_nginx = {{ parameter_list['nginx_location'] }}/sbin/nginx
-
 # Create a launcher script for the headless shell executable.
 [chromium-launcher]
-recipe = slapos.recipe.template:jinja2
-template = {{ parameter_list['template_launcher'] }}
-rendered = ${headless-chromium:bin_chromium_launcher}
-mode = 700
-context =
-  section param_chromium_headless headless-chromium
+recipe = slapos.cookbook:wrapper
+command-line = {{ parameter_list['chromium_wrapper'] }} --remote-debugging-address=:: --remote-debugging-port=${headless-chromium:remote-debugging-port} ${headless-chromium:url}
+wrapper-path = ${directory:service}/chromium
 
 # Create a configuration file for the proxy server.
 [nginx-config]
@@ -57,12 +48,9 @@ context =
 
 # Create a launcher script for the proxy server.
 [nginx-launcher]
-recipe = slapos.recipe.template:jinja2
-template = {{ parameter_list['template_nginx_launcher'] }}
-rendered = ${headless-chromium:bin_nginx_launcher}
-mode = 700
-context =
-  section param_chromium_headless headless-chromium
+recipe = slapos.cookbook:wrapper
+command-line = {{ parameter_list['nginx_location'] }}/sbin/nginx -c ${headless-chromium:nginx_config_target}
+wrapper-path = ${directory:service}/nginx
 
 [publish-connection-information]
 recipe = slapos.cookbook:publish

software/headless-chromium/software.cfg

@@ -3,7 +3,6 @@ extends =
   buildout.hash.cfg
   ../../stack/slapos.cfg
   ../../component/headless-chromium/buildout.cfg
-  ../../component/dash/buildout.cfg
   ../../component/nginx/buildout.cfg
 
 parts =
@@ -17,7 +16,6 @@ template = ${:_profile_base_location_}/${:filename}
 mode = 0644
 context =
   section buildout buildout
-  key dash_location dash:location
   key nginx_location nginx:location
   key chromium_wrapper chromium-wrapper:location
   key template_launcher_target template-chromium-launcher:target