html5as: update with the new recipe

See merge request nexedi/slapos!1020

software/html5as/buildout.hash.cfg

@@ -17,11 +17,11 @@
 
 [template-cfg]
 filename = instance.cfg.in
-md5sum = 8528c7b469caa8bdede682e6660ba702
+md5sum = 9e486efe4ab1aba8cb72b04f6c6da8ad
 
 [instance_html5as]
 _update_hash_filename_ = instance_html5as.cfg.in
-md5sum = d1efe7a42d66c416ddf8d24d8a8107f4
+md5sum = 191ec2a8b967a3944971709365bdcd2d
 
 [template_nginx_conf]
 _update_hash_filename_ = templates/nginx_conf.in

software/html5as/instance.cfg.in

@@ -9,8 +9,6 @@ offline = true
 [profile-common]
 nginx_location = {{ nginx_location }}
 dash_location = {{ dash_location }}
-tar_location = {{ tar_location }}
-curl_location = {{ curl_location }}
 template_nginx_conf = {{ template_nginx_conf_target }}
 template_mime_types = {{ template_mime_types_target }} 
 template_launcher = {{ template_launcher_target }}
@@ -28,6 +26,7 @@ context =
   section parameter_list profile-common
 # partition_ipv6 is the random ipv6 allocated to the local partition
   key partition_ipv6 slap-configuration:ipv6-random
+# slapparameter_dict: dictionary of all parameters
   key slapparameter_dict slap-configuration:configuration
   jsonkey default_parameter_dict :default-parameters
 default-parameters =

software/html5as/instance_html5as.cfg.in

@@ -3,6 +3,8 @@
 # Deploy html5as instance
 #
 #############################
+# parameter_dict: a dictionary with the default parameters from instance.cfg.in
+# replaces the values with the parameters of the instance request if there are any
 {% set parameter_dict = dict(default_parameter_dict, **slapparameter_dict) %}
 
 [buildout]
@@ -95,8 +97,6 @@ path_nginx_conf = ${directory:etc}/nginx.conf
 path_mime_types = ${directory:etc}/mime_types
 # Binaries
 path_shell = {{ parameter_list['dash_location'] }}/bin/dash
-curl-binary = {{ parameter_list['curl_location'] }}/bin/curl
-tar-binary = {{ parameter_list['tar_location'] }}/bin/tar
 
 # Executables
 bin_launcher = ${basedirectory:service}/launcher
@@ -131,13 +131,14 @@ context =
 # Command to put content in the docroot
 [downloader]
 recipe = slapos.recipe.build
-# Path where the recipe stores any produced file, 
+# Path where the recipe stores any produced file,
 # it will be automatically removed at the beginning of "install".
 location = ${directory:srv}/html5as
+# All the keys in this section will be available as a dict called "self.options"
 # We add: or '', otherwise jinja2 will render a 'None' string
 url = {{ parameter_dict['download_url'] or '' }}
 default_index_html = ${default_index_html:rendered}
-# If a tarball is passed as a parameter in "download_url",
+# If a tarball is passed as a parameter in download url
 # it's content will be served by the instance.
 # If the parameter is not provided it fallback to the default template
 install =
@@ -146,10 +147,10 @@ install =
   try:
     # Allow to do self.download() which can only be used in "online" mode
     self.buildout['buildout']['offline'] = 'false'
-    if options['url']:
+    if self.options['url']:
       # Use fonctions from the slapos.recipe.build repository
       # Download a file from a URL to a temporary path
-      file = self.download(options['url'], options.get('md5sum'))
+      file = self.download(self.options['url'])
       # Create a directory and extract the file that are compressed inside
       extract_dir = self.extract(file)
       # Return the right directory path
@@ -159,7 +160,7 @@ install =
     else:
       # Create directory and copy the default template inside
       os.makedirs(location)
-      shutil.copy(options['default_index_html'], location)
+      shutil.copy(self.options['default_index_html'], location)
   finally:
     # reset the parameter
     self.buildout['buildout']['offline'] = buildout_offline

software/html5as/software.cfg

@@ -13,8 +13,6 @@ extends =
 # In this example we extend needed components for html5as.
   ../../component/nginx/buildout.cfg
   ../../component/dash/buildout.cfg
-  ../../component/tar/buildout.cfg
-  ../../component/curl/buildout.cfg
 
 parts =
 # Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
@@ -36,8 +34,6 @@ context =
   section buildout buildout
   key nginx_location nginx:location
   key dash_location dash:location
-  key curl_location curl:location
-  key tar_location tar:location
   key template_nginx_conf_target template_nginx_conf:target
   key template_mime_types_target template_mime_types:target
   key template_launcher_target template_launcher:target