Merge remote-tracking branch 'upstream/master' into zope4py2

software/html5as/buildout.hash.cfg

@@ -21,7 +21,7 @@ md5sum = 23c15a579b66cef866b30a2f53b1b737
 
 [instance_html5as]
 _update_hash_filename_ = instance_html5as.cfg.in
-md5sum = 0b16e9a2cac16668e100687f19430b1e
+md5sum = d1b5747c064a752d7a6b09060604aa0a
 
 [template_nginx_conf]
 _update_hash_filename_ = templates/nginx_conf.in

software/html5as/instance_html5as.cfg.in

@@ -142,7 +142,7 @@ recipe = slapos.recipe.build
 # 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"
-archive = {{ '${downloader:destination}' if parameter_dict['download_url'] else '' }}
+archive = {{ '${downloader:target}' if parameter_dict['download_url'] else '' }}
 default_index_html = ${default_index_html:output}
 # If a tarball is passed as a parameter in download url
 # it's content will be served by the instance.