Stop using hexagonit.recipe.download

component/bazel/buildout.cfg

@@ -9,11 +9,10 @@ parts =
 do-not-strip-path = ${buildout:parts-directory}/bazel/bin/bazel
 
 [zulu]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download-unpacked
+shared = true
 url = http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-linux_x64.tar.gz
 md5sum = e5f4b1d997e50ffe4998c68c8ec45403
-strip-top-level-dir = true
 
 [template-bazel-crosstool]
 recipe = slapos.recipe.template:jinja2

component/firewalld/buildout.cfg

@@ -103,10 +103,8 @@ environment =
   GI_LIBS=-L${gobject-introspection:location}/lib -lgirepository-1.0
 
 [trusted-config]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/trusted.xml
-download-only = true
+recipe = slapos.recipe.build:download
+url = https://raw.githubusercontent.com/t-woerner/firewalld/v0.3.14/config/zones/${:filename}
 filename = trusted.xml
 md5sum = 893752ba2e93a1e96334dfee19f884ad
 

component/jupyter-py2/buildout.cfg

@@ -22,7 +22,6 @@ python_executable = ${buildout:bin-directory}/${:interpreter}
 [download-file-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-download-only = true
 
 [jupyter-notebook-config]
 <= download-file-base

component/libiconv/buildout.cfg

 [buildout]
+extends =
+  ../patch/buildout.cfg
 parts =
   libiconv
 
-[libiconv.gets.patch]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 8a20d8afe0617fce56f77537d2b84621
-download-only = true
-filename = libiconv.gets.patch
-
 [libiconv]
-virtual-depends =
-  ${libiconv.gets.patch:md5sum}
+patch-binary = ${patch:location}/bin/patch
 patch-options = -p1
 patches =
-  ${libiconv.gets.patch:location}/${libiconv.gets.patch:filename}
+  ${:_profile_base_location_}/libiconv.gets.patch#8a20d8afe0617fce56f77537d2b84621
 recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 md5sum = e34509b1623cec449dfeb73d7ce9c6c6

component/vnu/buildout.cfg

@@ -6,9 +6,8 @@ parts =
   vnu
 
 [vnu]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-strip-top-level-dir = true
+recipe = slapos.recipe.build:download-unpacked
+shared = true
 url = https://github.com/validator/validator/releases/download/17.11.1/vnu.war_17.11.1.zip
 md5sum = 2af6dec153a5011cd6fcc85ce5fb599d
 

software/caddy-frontend/software.cfg

@@ -63,7 +63,6 @@ eggs =
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance-common.cfg.in
 rendered = ${buildout:directory}/instance-common.cfg
-mode = 0644
 context =
   key develop_eggs_directory buildout:develop-eggs-directory
   key eggs_directory buildout:eggs-directory
@@ -129,29 +128,24 @@ htpasswd = ${:bin_directory}/htpasswd
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
 rendered = ${buildout:directory}/template.cfg
-mode = 0644
 context =
   section software_parameter_dict software-parameter-section
 
 [profile-caddy-frontend]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg.in
-mode = 0644
 
 [profile-caddy-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
-mode = 0644
 
 [profile-kedifa]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-kedifa.cfg.in
-mode = 0644
 
 [download-template]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 640
 
 [profile-slave-list]
 <=download-template
@@ -181,7 +175,6 @@ mode = 640
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/templates/wrapper.in
 output = ${buildout:directory}/template-wrapper.cfg
-mode = 0644
 
 [template-trafficserver-records-config]
 <=download-template

software/caucase/software.cfg

@@ -10,8 +10,6 @@ parts +=
 [instance-caucased]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-# XXX: following mode should be the default
-mode = 644
 
 [instance]
 recipe = slapos.recipe.template:jinja2

software/cloudooo/software-common.cfg

@@ -97,7 +97,6 @@ template-monitor = ${monitor2-template:rendered}
 [template-cloudooo-instance]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 640
 
 [versions]
 argparse = 1.4.0

software/erp5testnode/testsuite/instance.cfg.in

@@ -10,7 +10,7 @@ test = dynamic-template-resilient-test:rendered
 
 [dynamic-template-resilient-test]
 recipe = slapos.recipe.template:jinja2
-template = ${template-resilient-test:location}/${template-resilient-test:filename}
+template = ${template-resilient-test:target}
 rendered = $${buildout:directory}/template-resilient-test.cfg
 bin-directory = ${buildout:bin-directory}
 context =
@@ -19,4 +19,3 @@ context =
     key slapparameter_dict slap-configuration:configuration
     raw bin_directory ${buildout:bin-directory}
     ${template-resilient-test:extra-context}
-mode = 0644

software/erp5testnode/testsuite/kvm.cfg

@@ -6,14 +6,9 @@ extends =
 parts += template-erp5testnode
 
 [default-test-image]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-filename = ${:_buildout_section_name_}
+recipe = slapos.recipe.build:download
 url = http://www.nexedi.org/static/slapos/kvm_resiliency_test/virtual.qcow.gz
 md5sum = dd82c771f6f7738fb4b0fc1330ed8236
-download-only = true
-mode = 0644
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template-resilient-test]
 filename = instance-kvm-resilient-test.cfg.jinja2
@@ -21,7 +16,7 @@ md5sum = 71ddbdeb8769bcb0ebb3c9407ef7e36c
 # Ingest extra-context, on a the final template-resilient-test rendering
 # always ingest raw values.
 extra-context =
-  raw default_test_image_url file://${default-test-image:location}/${default-test-image:filename}
+  raw default_test_image_url file://${default-test-image:target}
       raw default_test_image_md5sum ${default-test-image:md5sum}
 
   

software/erp5testnode/testsuite/testsuite.cfg

@@ -3,16 +3,10 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 md5sum = d864a32edab3c4f7207a7d4fe6bb7e30
 output = ${buildout:directory}/template.cfg
-mode = 0644
 
 [template]
 output = ${buildout:directory}/template-original.cfg
 
 [template-resilient-test]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
-download-only = true
-on-update = true
-extra-context =

software/gitlab/software.cfg

@@ -397,10 +397,9 @@ destination = ${buildout:directory}/${:_buildout_section_name_}
 <= download-file
 
 [gitlab-demo-backup.git]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download-unpacked
 url = https://lab.nexedi.com/alain.takoudjou/labdemo.backup/repository/archive.tar.gz?ref=master
 md5sum = d40e5e211dc9a4e5ada9c0250377c639
-strip-top-level-dir = true
 
 [versions]
 cns.recipe.symlink = 0.2.3

software/grafana/software.cfg

@@ -99,8 +99,6 @@ stop-on-error = true
 [download-file-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-download-only = true
-mode = 0644
 
 [influxdb-config-file]
 <= download-file-base

software/headless-chromium/software.cfg

@@ -38,7 +38,6 @@ context =
 [download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [instance-headless-chromium]
 <= download-base

software/hellorina/instance-root.cfg.in

@@ -32,7 +32,7 @@ return =
 
 [proxy]
 recipe = slapos.cookbook:wrapper
-command-line = {{ python_executable }} {{ rina_proxy }} ${server:instance-guid} ${:ipv6} ${:port}
+command-line = {{ rina_proxy }} ${server:instance-guid} ${:ipv6} ${:port}
 wrapper-path = ${directory:service}/proxy
 environment =
   PATH={{ rina_tools_location }}/bin:%(PATH)s

software/hellorina/instance.cfg.in

@@ -28,7 +28,6 @@ template = {{ instance_root }}
 extra-context =
     import urlparse urlparse
     key ipv6 slap-configuration:ipv6-random
-    raw python_executable {{ python_executable }}
     raw rina_proxy {{ rina_proxy }}
 
 [server]

software/hellorina/software.cfg

@@ -17,34 +17,39 @@ environment +=
 [template]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = f6c61225990986d94d0017b07b873aa7
+md5sum = d7506e861ef87977eaa554b8928d2c99
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 rendered = ${buildout:directory}/template.cfg
 context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
-    key python_executable python:executable
     key rina_tools_location rina-tools:location
     key instance_root instance-root:target
     key instance_server instance-server:target
-    key rina_proxy proxy:target
+    key rina_proxy proxy:location
 
 [download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_buildout_section_name_}.cfg.in
-# XXX: following mode should be the default
-mode = 644
 
 [instance-root]
 <= download-base
-md5sum = f647054be67998f9eece174f106c4464
+md5sum = 1c0e222aab51dfc598094e972f1d1482
 
 [instance-server]
 <= download-base
 md5sum = 88a451b0f7f8def12713b92b91659b98
 
 [proxy]
-recipe = slapos.recipe.build:download
+recipe = slapos.recipe.build
+location = ${buildout:bin-directory}/${:_buildout_section_name_}
 url = ${:_profile_base_location_}/${:_buildout_section_name_}
-mode = 755
 md5sum = 78b77a6bda9958f547f7d89b747731e3
+install =
+  import os, sys
+  with open(self.download(options['url'], options['md5sum'])) as src, \
+       open(options['location'], 'w') as dst:
+    os.fchmod(dst.fileno(), 0o755)
+    src.readline()
+    dst.write('#!%s\n' % sys.executable)
+    dst.write(src.read())

software/html5as-base/software.cfg

@@ -28,7 +28,6 @@ rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/${:filename}
 filename = instance.cfg.in
 md5sum = 310aab063704794065ee3bc8f81fdc70
-mode = 0644
 context =
   section buildout buildout
   key nginx_location nginx:location
@@ -44,28 +43,24 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 _update_hash_filename_ = instance_html5as.cfg.in
 md5sum = 9b7ed68551cac5967915979383238669
-mode = 0644
 
 [template_nginx_conf]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 _update_hash_filename_ = templates/nginx_conf.in
 md5sum = 61dc4c82bf48563228ce4dea6c5c6319
-mode = 0644
 
 [template_launcher]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 _update_hash_filename_ = templates/launcher.in
 md5sum = 6cb0d64905ae7fc67277c1bf76b86875
-mode = 0644
 
 [template_mime_types]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
 _update_hash_filename_ = templates/mime_types.in
 md5sum = 4ef94a7b458d885cd79ba0b930a5727e
-mode = 0644
 
 [extra-eggs]
 recipe  = zc.recipe.egg

software/html5as/software.cfg

@@ -29,7 +29,6 @@ parts =
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/${:filename}
-mode = 0644
 context =
   section buildout buildout
   key nginx_location nginx:location
@@ -50,7 +49,6 @@ context =
 [download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 # Download instance_html5as.cfg.in
 [instance_html5as]

software/hugo/software.cfg

@@ -29,7 +29,6 @@ template_monitor = ${monitor-template:rendered}
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/template.cfg
 template = ${:_profile_base_location_}/${:filename}
-mode = 0644
 context =
   section buildout buildout
   section parameter_list profile-common
@@ -37,7 +36,6 @@ context =
 [download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [template_nginx_conf]
 <= download-base

software/jscrawler/software.cfg

@@ -36,13 +36,11 @@ update-command = ${:command}
 [download-template]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
 
 [instance]
 recipe = slapos.recipe.template:jinja2
 rendered = ${buildout:directory}/instance.cfg
 template = ${:_profile_base_location_}/${:filename}
-mode = 0644
 context =
     key bash_location bash:location
     key bin_directory buildout:bin-directory

software/jupyter/software.cfg

@@ -25,8 +25,6 @@ python_executable = ${buildout:bin-directory}/${:interpreter}
 [download-file-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-download-only = true
-mode = 0644
 
 [jupyter-notebook-config]
 <= download-file-base

software/kvm/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = f2b0f1ed27148504f220e06eaceff935
+md5sum = 087f226ba90928dcc5a722d7008c867a
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
@@ -78,17 +78,17 @@ filename = instance-kvm-http.cfg.in
 md5sum = d57764bb7135037b4d21543b2f56ce1d
 
 [image-download-controller]
-_update_hash_filename_ = template/image-download-controller.py
+filename = template/image-download-controller.py
 md5sum = 9c67058edcc4edae0b57956c0932a9fc
 
 [image-download-config-creator]
-_update_hash_filename_ = template/image-download-config-creator.py
+filename = template/image-download-config-creator.py
 md5sum = 54261e418ab9860efe73efd514c4d47f
 
 [whitelist-firewall-download-controller]
-_update_hash_filename_ = template/whitelist-firewall-download-controller.py
+filename = template/whitelist-firewall-download-controller.py
 md5sum = bc64e29546833817636261d1b28aa6dc
 
 [whitelist-domains-default]
-_update_hash_filename_ = template/whitelist-domains-default
+filename = template/whitelist-domains-default
 md5sum = e9d40162ba77472775256637a2617d14

software/kvm/instance.cfg.in

@@ -67,7 +67,7 @@ filename = template-kvm-cluster.cfg
 extra-context =
   section parameter_dict dynamic-template-kvm-cluster-parameters
   raw logrotate_cfg ${template-logrotate-base:rendered}
-  raw template_content ${template-content:location}/${template-content:filename}
+  raw template_content ${template-content:target}
   raw template_httpd_cfg ${template-httpd:rendered}
   raw template_monitor ${monitor2-template:rendered}
 
@@ -77,13 +77,13 @@ template = ${template-kvm:location}/instance-kvm.cfg.jinja2
 filename = template-kvm.cfg
 extra-context =
   section slap_configuration slap-configuration
-  raw ansible_promise_tpl ${template-ansible-promise:location}/${template-ansible-promise:filename}
+  raw ansible_promise_tpl ${template-ansible-promise:target}
   raw curl_executable_location ${curl:location}/bin/curl
   raw dash_executable_location ${dash:location}/bin/dash
   raw dnsresolver_executable ${buildout:bin-directory}/dnsresolver
   raw dcron_executable_location ${dcron:location}/sbin/crond
   raw debian_amd64_netinst_location ${debian-amd64-bullseye-netinst.iso:target}
-  raw whitelist_domains_default ${whitelist-domains-default:location}/${whitelist-domains-default:filename}
+  raw whitelist_domains_default ${whitelist-domains-default:target}
   raw whitelist_firewall_download_controller ${whitelist-firewall-download-controller:target}
   raw image_download_controller ${image-download-controller:target}
   raw image_download_config_creator ${image-download-config-creator:target}
@@ -94,12 +94,12 @@ extra-context =
   raw python_eggs_executable ${buildout:bin-directory}/${python-with-eggs:interpreter}
   raw qemu_executable_location ${qemu:location}/bin/qemu-system-x86_64
   raw qemu_img_executable_location ${qemu:location}/bin/qemu-img
-  raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
+  raw qemu_start_promise_tpl ${template-qemu-ready:target}
   raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
   raw template_httpd_cfg ${template-httpd:rendered}
-  raw template_content ${template-content:location}/${template-content:filename}
-  raw template_kvm_controller_run ${template-kvm-controller:location}/${template-kvm-controller:filename}
-  raw template_kvm_run ${template-kvm-run:location}/${template-kvm-run:filename}
+  raw template_content ${template-content:target}
+  raw template_kvm_controller_run ${template-kvm-controller:target}
+  raw template_kvm_run ${template-kvm-run:target}
   raw template_monitor ${monitor2-template:rendered}
   raw websockify_executable_location ${buildout:directory}/bin/websockify
   raw wipe_disk_wrapper ${buildout:directory}/bin/securedelete
@@ -134,7 +134,7 @@ context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
     raw kvm_template $${dynamic-template-kvm:rendered}
-    raw template_kvm_export ${template-kvm-export-script:location}/${template-kvm-export-script:filename}
+    raw template_kvm_export ${template-kvm-export-script:target}
     key pbsready_export_template template-pbsready-export:rendered
     raw gzip_binary ${gzip:location}/bin/gzip
     key slapparameter_dict slap-configuration:configuration
@@ -149,7 +149,7 @@ context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
     raw qemu_location ${qemu:location}
-    raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
+    raw template_kvm_import ${template-kvm-import-script:target}
     key pbsready_import_template template-pbsready-import:rendered
     key slapparameter_dict slap-configuration:configuration
     raw zcat_binary ${gzip:location}/bin/zcat

software/kvm/software.cfg

@@ -58,95 +58,55 @@ scripts =
 
 # Create all templates that will be used to deploy instances
 [download-base]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
-
-[download-file-base]
-<= download-base
-ignore-existing = true
-download-only = true
-
-[download-template-base]
-<= download-file-base
-url = ${:_profile_base_location_}/template/${:path}
-path = ${:filename}
 
-[template-file-base]
+[template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
-
-[template]
-<= template-file-base
 output = ${buildout:directory}/template.cfg
 
 [template-kvm]
-<= download-file-base
-on-update = true
+<= download-base
 
 [template-kvm-cluster]
-<= download-file-base
-on-update = true
+<= download-base
 
 [template-kvm-resilient]
-<= download-file-base
-on-update = true
+<= download-base
 
 [template-kvm-import]
-<= download-file-base
-on-update = true
+<= download-base
 
 [template-kvm-import-script]
-<= download-template-base
-filename = kvm-import.sh.jinja2
-mode = 0755
+<= download-base
 
 [template-kvm-export]
-<= download-file-base
-on-update = true
+<= download-base
 
 [template-kvm-export-script]
-<= download-template-base
-filename = kvm-export.sh.jinja2
-mode = 0755
+<= download-base
 
 [template-nbd]
-<= download-file-base
-on-update = true
+<= download-base
 
 [template-ansible-promise]
-<= download-template-base
-filename = ansible-promise.in
+<= download-base
 
 [template-kvm-run]
-<= download-template-base
-filename = template-kvm-run.in
-on-update = true
+<= download-base
 
 [template-kvm-controller]
-<= download-template-base
-filename = kvm-controller-run.in
-on-update = true
+<= download-base
 
 [template-apache-conf]
-<= download-template-base
-filename = apache.conf.in
-on-update = true
+<= download-base
 
 [template-content]
-<= download-template-base
-filename = template-content.in
-on-update = true
+<= download-base
 
 [template-qemu-ready]
-<= download-template-base
-filename = qemu-is-ready.in
-on-update = true
-
-[whitelist-domains-default]
-<= download-template-base
-filename = whitelist-domains-default
+<= download-base
 
 [template-httpd]
 recipe = slapos.recipe.template:jinja2
@@ -155,19 +115,19 @@ rendered = ${buildout:parts-directory}/${:_buildout_section_name_}/instance-kvm-
 context =
     key apache_location apache:location
     raw openssl_executable_location ${openssl:location}/bin/openssl
-    raw template_apache_conf ${template-apache-conf:location}/${template-apache-conf:filename}
+    key template_apache_conf template-apache-conf:target
 
 [image-download-controller]
-recipe = slapos.recipe.build:download
-url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 640
+<= download-base
 
 [image-download-config-creator]
-<= image-download-controller
+<= download-base
 
 [whitelist-firewall-download-controller]
-<= image-download-controller
+<= download-base
 
+[whitelist-domains-default]
+<= download-base
 
 [versions]
 websockify = 0.9.0

software/kvm/test/test.py

@@ -1437,7 +1437,7 @@ class TestImageDownloadController(InstanceTestCase, FakeImageServerMixin):
     self.image_download_controller = os.path.join(
       self.slap.instance_directory, self.__partition_reference__ + '0',
       'software_release', 'parts', 'image-download-controller',
-      'image-download-controller')
+      'image-download-controller.py')
 
   def tearDown(self):
     self.stopImageHttpServer()

software/lamp-template/software.cfg

@@ -15,7 +15,6 @@ recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template/REPLACE_ME_BY_APPLICATION_TEMPLATE_NAME
 #md5sum = Student may put here md5sum of this file, this is good idea
 filename = template.in
-mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]

software/monitor/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = b6c2df0d4a62473d6dae26b10c0a4adc
+md5sum = 37966f5f7c6b82137c0388ca3520cb71
 
 [template-monitor]
 _update_hash_filename_ = instance-monitor.cfg.jinja2

software/monitor/instance.cfg

@@ -25,7 +25,7 @@ context = key develop_eggs_directory buildout:develop-eggs-directory
           raw buildout_bin ${buildout:bin-directory}
           raw monitor_template_output ${monitor-template:output}
           raw network_benck_cfg_output ${network-bench-cfg:output}
-          raw monitor_collect_csv_dump ${monitor-collect-csv-dump:output}
+          raw monitor_collect_csv_dump ${monitor-collect-csv-dump:target}
 mode = 0644
 
 [instance-template]
@@ -93,7 +93,7 @@ context = import json_module json
           key template_surykatka_ini surykatka:ini
           raw buildout_bin ${buildout:bin-directory}
           raw monitor_template_output ${monitor-template:output}
-          raw monitor_collect_csv_dump ${monitor-collect-csv-dump:output}
+          raw monitor_collect_csv_dump ${monitor-collect-csv-dump:target}
 mode = 0644
 
 

software/monitor/software.cfg

@@ -15,7 +15,6 @@ parts =
   template
   template-monitor-edgetest
   template-monitor
-  monitor-collect-csv-dump
 
 [python]
 part = python3
@@ -24,27 +23,22 @@ part = python3
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
-mode = 0644
 
 [template-monitor]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [template-monitor-edgetest-basic]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [template-monitor-edgetest]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [template-monitor-edgebot]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [template-surykatka-ini]
 recipe = slapos.recipe.build:download
@@ -53,19 +47,15 @@ url = ${:_profile_base_location_}/${:_update_hash_filename_}
 [json-test-template]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [network-bench-cfg]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:parts-directory}/${:_buildout_section_name_}
-mode = 0644
 
 [monitor-collect-csv-dump]
-<= monitor-template-script
-url = ${:_profile_base_location_}/script/${:filename}
-filename = collect_csv_dump.py
-output = ${:destination}/${:filename}
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:filename}
 
 [surykatka]
 recipe = zc.recipe.egg
@@ -76,7 +66,6 @@ recipe = zc.recipe.egg
 eggs +=
   slapos.cookbook
   slapos.recipe.cmmi
-  hexagonit.recipe.download
   plone.recipe.command
 scripts =
 

software/neoppod/software-common.cfg

@@ -59,8 +59,6 @@ adapter-egg = ${python-mysqlclient:egg}
 [download-base-neo]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-# XXX: following mode should be the default
-mode = 644
 
 # XXX: must be rendered, not just dled
 [instance-common]

software/nextcloud/software.cfg

@@ -4,26 +4,22 @@ extends =
   ../../component/redis/buildout.cfg
   ../../stack/lamp/buildout.cfg
 
-[nc-download-base]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
+[nc-download]
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
-
 
 [application]
 url = https://download.nextcloud.com/server/releases/nextcloud-16.0.3.tar.bz2
 md5sum = d81902d2dec5d547779bec6336a438be
 
 [template-nextcloud-install.sh] 
-<= nc-download-base
+<= nc-download
 
 [template-apache-httpd]
-<= nc-download-base
+<= nc-download
 
 [template-nextcloud-config.json]
-<= nc-download-base
+<= nc-download
 
 [template-nextcloud-instance]
 recipe = slapos.recipe.template:jinja2
@@ -37,48 +33,46 @@ context =
           key php_location           apache-php:location
           raw redis_bin              ${redis:location}/bin/redis-server
           raw redis_cli              ${redis:location}/bin/redis-cli
-          raw nextcloud_install_sh   ${template-nextcloud-install.sh:location}/${template-nextcloud-install.sh:filename}
-          raw nextcloud_apache_httpd ${template-apache-httpd:location}/${template-apache-httpd:filename}
-          raw nextcloud_parameter_json ${template-nextcloud-config.json:location}/${template-nextcloud-config.json:filename}
+          key nextcloud_install_sh   template-nextcloud-install.sh:target
+          key nextcloud_apache_httpd template-apache-httpd:target
+          key nextcloud_parameter_json template-nextcloud-config.json:target
           section nextcloud_apps     nextcloud-apps
 
 [custom-application-deployment]
 path = ${template-nextcloud-instance:rendered}
 part-list = nextcloud-install.sh
 
+[nc-download-unpacked]
+recipe = slapos.recipe.build:download-unpacked
+shared = true
+
 [news-updater]
-recipe = hexagonit.recipe.download
+<= nc-download-unpacked
 url = https://github.com/nextcloud/news-updater/archive/10.0.1.tar.gz
 md5sum = 37387199c0482e08d01e9294cd95eaad
-strip-top-level-dir = true
-
-[nc-download-app]
-<= nc-download-base
-download-only = false
-strip-top-level-dir = true
 
 [nextcloud-app-spreed]
-<= nc-download-app
+<= nc-download-unpacked
 url = https://github.com/nextcloud/spreed/releases/download/v6.0.5/spreed-6.0.5.tar.gz
 md5sum = 002c09e543edc141f6ca848782573376
 
 [nextcloud-app-richdocuments]
-<= nc-download-app
+<= nc-download-unpacked
 url = https://github.com/nextcloud/richdocuments/releases/download/v3.7.17/richdocuments.tar.gz
 md5sum = 5559cd14a4a0a93d2a39b260538839f8
 
 [nextcloud-app-calendar]
-<= nc-download-app
+<= nc-download-unpacked
 url = https://github.com/nextcloud/calendar/releases/download/v1.7.3/calendar.tar.gz
 md5sum = ab398d943eb6939e3e71df5b1a1abf87
 
 [nextcloud-app-rainloop]
-<= nc-download-app
+<= nc-download-unpacked
 url = https://github.com/pierre-alain-b/rainloop-nextcloud/releases/download/6.1.4/rainloop.tar.gz
 md5sum = 7cefc3dd3bd52b42d381de7d7447691f
 
 [nextcloud-app-news]
-<= nc-download-app
+<= nc-download-unpacked
 url = https://github.com/nextcloud/news/releases/download/14.2.2/news.tar.gz
 md5sum = f48d4b5dcbc078131bb86a4ae619da99
 

software/powerdns/software.cfg

@@ -26,33 +26,27 @@ eggs =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template.cfg
-mode = 0644
 
 [template-powerdns]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
 output = ${buildout:directory}/template-powerdns.cfg
-mode = 0644
 
 [template-pdns-configuration]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 640
 
 [template-dns-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [iso-list]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [template-zones-file]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
 
 [versions]
 PyRSS2Gen = 1.1

software/proftpd/software.cfg

@@ -18,8 +18,6 @@ part = python3
 [download-file-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-download-only = true
-mode = 0644
 
 [proftpd-config-file]
 <= download-file-base
@@ -31,7 +29,6 @@ mode = 0644
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/instance.cfg
-mode = 0644
 extensions = jinja2.ext.do
 context =
   section buildout buildout

software/re6stnet/software.cfg

@@ -72,7 +72,6 @@ context =
 [download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 644
 
 [template]
 recipe = slapos.recipe.template:jinja2

software/slapos-master/software.cfg

@@ -62,7 +62,6 @@ extra-paths +=
 [download-base-part]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 644
 
 [template-erp5]
 < = download-base-part

software/slaprunner/buildout.hash.cfg

@@ -14,11 +14,11 @@
 # not need these here).
 [template]
 filename = instance.cfg
-md5sum = 8d6878ff1d2e75010c50a1a2b0c13b24
+md5sum = ba3539d959143a3be76fcb54196a3aa8
 
 [template-runner]
 filename = instance-runner.cfg
-md5sum = 384285ab789396b6e674a8125ce2d030
+md5sum = efa0d1647dee2689485264daf256c76d
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2

software/slaprunner/instance-runner.cfg

@@ -362,7 +362,7 @@ work_dir = $${slaprunner:working-directory}
 
 [nginx_conf]
 recipe = slapos.recipe.template:jinja2
-template = ${template_nginx_conf:location}/${template_nginx_conf:filename}
+template = ${template_nginx_conf:target}
 rendered = $${nginx-frontend:path_nginx_conf}
 context =
     key shellinabox_socket shellinabox:socket
@@ -372,7 +372,7 @@ context =
 
 [nginx-launcher]
 recipe = slapos.recipe.template:jinja2
-template = ${template_launcher:location}/${template_launcher:filename}
+template = ${template_launcher:target}
 rendered = $${nginx-frontend:bin_launcher}
 mode = 700
 context =
@@ -404,7 +404,7 @@ httpd_cors_file = $${slaprunner-httpd-cors:location}
 
 [httpd-conf]
 recipe = slapos.recipe.template:jinja2
-template = ${template_httpd_conf:location}/${template_httpd_conf:filename}
+template = ${template_httpd_conf:target}
 rendered = $${directory:etc}/httpd.conf
 context =
     section parameters httpd-parameters
@@ -663,7 +663,7 @@ buildout-shared-folder = $${runnerdirectory:home}/shared
 
 [slapos-cfg]
 recipe = slapos.recipe.template:jinja2
-template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}
+template = ${template-slapos-cfg:target}
 rendered = $${slaprunner:slapos.cfg}
 mode = 700
 context =
@@ -673,7 +673,7 @@ context =
 
 [slapos-test-cfg]
 recipe = slapos.recipe.template:jinja2
-template = ${template-slapos-cfg:location}/${template-slapos-cfg:filename}
+template = ${template-slapos-cfg:target}
 rendered = $${test-runner:slapos.cfg}
 mode = 700
 context =
@@ -681,7 +681,7 @@ context =
 
 [slapformat-definition.cfg]
 recipe = slapos.recipe.template:jinja2
-template = ${template-slapformat-definition.cfg:location}/${template-slapformat-definition.cfg:filename}
+template = ${template-slapformat-definition.cfg:target}
 rendered = $${slaprunner:slapformat-definition.cfg}
 mode = 700
 context =
@@ -727,7 +727,7 @@ command = $${prepare-software:wrapper-path}
 [instance-parameters]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
-template = ${template-parameters:location}/${template-parameters:filename}
+template = ${template-parameters:target}
 rendered = $${directory:etc}/.parameter.xml.default
 mode = 0644
 context =
@@ -759,7 +759,7 @@ stop-on-error = true
 
 [bash-profile]
 recipe = slapos.recipe.template:jinja2
-template = ${template-bash-profile:location}/${template-bash-profile:filename}
+template = ${template-bash-profile:target}
 rendered = $${buildout:directory}/.bash_profile
 context =
     raw path $${shell-environment:path}
@@ -826,7 +826,7 @@ slapformat-definition.cfg = $${slaprunner:slapformat-definition.cfg}
 
 [supervisord-conf]
 recipe = slapos.recipe.template:jinja2
-template = ${template-supervisord:location}/${template-supervisord:filename}
+template = ${template-supervisord:target}
 rendered = $${directory:etc}/supervisord.conf
 context =
     import multiprocessing multiprocessing
@@ -836,7 +836,7 @@ context =
 
 [listener-slapgrid-bin]
 recipe = slapos.recipe.template:jinja2
-template = ${template-listener-slapgrid:location}/${template-listener-slapgrid:filename}
+template = ${template-listener-slapgrid:target}
 rendered = $${directory:bin}/listener_slapgrid.py
 mode = 0744
 context =
@@ -905,7 +905,7 @@ private-path-list +=
 
 [monitor-check-webrunner-internal-instance]
 recipe = slapos.recipe.template:jinja2
-template = ${monitor-check-webrunner-internal-instance:location}/${monitor-check-webrunner-internal-instance:filename}
+template = ${monitor-check-webrunner-internal-instance:target}
 rendered = $${monitor-directory:bin}/$${:filename}
 filename = monitor-check-webrunner-internal-instance
 mode = 0744
@@ -913,7 +913,7 @@ mode = 0744
 ## Slapuser slapos command script
 [template-slapuser-script]
 recipe = slapos.recipe.template:jinja2
-template = ${template-slapuser-script:location}/${template-slapuser-script:filename}
+template = ${template-slapuser-script:target}
 rendered = $${buildout:bin-directory}/slapos
 mode = 0744
 context =

software/slaprunner/instance.cfg

@@ -63,7 +63,7 @@ context =
   key slapparameter_dict slap-configuration:configuration
   raw software_release_bin ${buildout:bin-directory}
   raw backup_wait_time ${exporter-default-configuration:backup_wait_time}
-  raw monitor_check_resilient_feed_template_path ${template-monitor-check-resilient-feed:location}/${template-monitor-check-resilient-feed:filename}
+  raw monitor_check_resilient_feed_template_path ${template-monitor-check-resilient-feed:target}
   raw buildout_executable_location ${buildout:executable}
   raw bash_executable_location ${bash:location}/bin/bash
   raw rsync_bin_folder ${rsync:location}/bin
@@ -78,12 +78,12 @@ context =
   key template_runner_path instance-base-runner:rendered
   key slapparameter_dict slap-configuration:configuration
   raw software_release_bin ${buildout:bin-directory}
-  raw importer_script_path ${template-runner-import-script:location}/${template-runner-import-script:filename}
+  raw importer_script_path ${template-runner-import-script:target}
   raw buildout_executable_location ${buildout:executable}
   raw bash_executable_location ${bash:location}/bin/bash
   raw sqlite3_executable_location ${sqlite3:location}/bin/sqlite3
   raw rsync_executable_location ${rsync:location}/bin/rsync
-  raw software_release_information_template ${template-resilient-software-release-information:destination}/${template-resilient-software-release-information:filename}
+  raw software_release_information_template ${template-resilient-software-release-information:target}
 
 [slap-configuration]
 recipe = slapos.cookbook:slapconfiguration

software/slaprunner/software.cfg

@@ -54,23 +54,10 @@ parts =
 [template-base]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
 
 [download-base]
-recipe = hexagonit.recipe.download
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
-
-[download-only-base]
-< = download-base
-ignore-existing = true
-download-only = true
-
-[template-download-base]
-# Downloads from template directory into current directory
-< = download-only-base
-url = ${:_profile_base_location_}/template/${:filename}
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [template]
 < = template-base
@@ -81,66 +68,52 @@ output = ${buildout:directory}/template.cfg
 output = ${buildout:directory}/template-runner.cfg.in
 
 [template-runner-import-script]
-< = template-download-base
-filename = runner-import.sh.jinja2
+< = download-base
 
 [instance-runner-import]
 < = download-base
-recipe = slapos.recipe.build:download
 
 [instance-runner-export]
 < = download-base
-recipe = slapos.recipe.build:download
 
 [template-resilient]
 < = download-base
-recipe = slapos.recipe.build:download
 
 [template_nginx_conf]
-< = download-only-base
+< = download-base
 
 [template_httpd_conf]
-< = download-only-base
+< = download-base
 
 [template_launcher]
 < = download-base
-recipe = slapos.recipe.build:download
 
 [template-slapos-cfg]
-< = template-download-base
-filename = slapos.cfg.in
+< = download-base
 
 [template-slapformat-definition.cfg]
-< = template-download-base
-filename = slapformat-definition.cfg.in
+< = download-base
 
 [template-parameters]
-< = download-only-base
+< = download-base
 
 [template-bash-profile]
-< = template-download-base
-filename = bash_profile.in
+< = download-base
 
 [template-supervisord]
-< = template-download-base
-filename = supervisord.conf.in
+< = download-base
 
 [template-listener-slapgrid]
-< = template-download-base
-filename = listener_slapgrid.py.in
+< = download-base
 
 [monitor-check-webrunner-internal-instance]
-< = template-download-base
-destination = ${:location}/${:filename}
-filename = monitor-check-webrunner-internal-instances.py
+< = download-base
 
 [template-resilient-software-release-information]
-< = template-download-base
-filename = resilient_software_release_information.py.in
+< = download-base
 
 [template-slapuser-script]
-< = template-download-base
-filename = slapos-slapuser-script.in
+< = download-base
 
 [template-buildout-shared-part-list]
 < = template-base

software/turnserver/software.cfg

@@ -18,7 +18,6 @@ parts =
 [download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 644
 
 [instance-cfg]
 recipe = slapos.recipe.template

software/wordpress/software.cfg

@@ -10,9 +10,7 @@ md5sum = 409889c98b13cbdbb9fd121df859ae3e
 [application-template]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-download-only = True
 filename = template.in
-mode = 0644
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 
 [application-configuration]

stack/caucase/buildout.cfg

@@ -32,7 +32,6 @@ scripts =
 [caucase-jinja2-library]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
 depends = ${caucase-jinja2-library-eggs:eggs}
 
 [versions]

stack/lamp/buildout.cfg

@@ -32,17 +32,11 @@ extends =
 
 
 [template-download-base]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-mode = 0644
 
 [application]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-# If the provided tarball does not contain top directory, this option should be changed to false
-strip-top-level-dir = true
+recipe = slapos.recipe.build:download-unpacked
 
 #----------------
 #--
@@ -93,10 +87,10 @@ context =
     key groonga_plugin_dir groonga:groonga-plugin-dir
     key groonga_mysql_normalizer_plugin_dir groonga-normalizer-mysql:groonga-plugin-dir
     key percona_toolkit_location percona-toolkit:location
-    key template_php_ini template-php.ini:output
-    key template_apache_conf template-apache.conf:output
-    key template_apache_php instance-apache-php:output
-    key template_lamp instance-lamp:output
+    key template_php_ini template-php.ini:target
+    key template_apache_conf template-apache.conf:target
+    key template_apache_php instance-apache-php:target
+    key template_lamp instance-lamp:target
     key template_mariadb template-mariadb:target
     key template_mariadb_initial_setup template-mariadb-initial-setup:target
     key template_mysqld_wrapper template-mysqld-wrapper:rendered
@@ -107,19 +101,15 @@ context =
 
 [instance-apache-php]
 <= template-download-base
-output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 
 [instance-lamp]
 <= template-download-base
-output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 
 [template-apache.conf]
 <= template-download-base
-output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 
 [template-php.ini]
 <= template-download-base
-output = ${buildout:parts-directory}/${:_buildout_section_name_}/${:filename}
 
 [erp5]
 # lamp stack reuses erp5 stack to have mariadb, but we don't need to checkout erp5 here.

stack/logrotate/buildout.cfg

@@ -10,8 +10,6 @@ parts =
 [logrotate-download-base]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:filename}
-# XXX: following mode should be the default
-mode = 644
 
 [logrotate-conf-template]
 < = logrotate-download-base

stack/monitor/buildout.cfg

@@ -17,17 +17,8 @@ parts =
   monitor2-template
 
 [monitor-download-base]
-recipe = hexagonit.recipe.download
-ignore-existing = true
-download-only = true
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/${:_update_hash_filename_}
-mode = 0644
-
-[monitor-template-script]
-<= monitor-download-base
-url = ${:_profile_base_location_}/scripts/${:filename}
-destination = ${buildout:parts-directory}/monitor-scripts
-on-update = true
 
 [monitor-eggs]
 recipe = zc.recipe.egg

stack/resilient/buildout.cfg

@@ -39,7 +39,6 @@ eggs =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready.cfg.in
 output = ${buildout:directory}/pbsready.cfg
-mode = 0644
 
 [pbsready-import]
 # An import instance has an importer script, which is called
@@ -47,7 +46,6 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/pbsready-import.cfg.in
 output = ${buildout:directory}/pbsready-import.cfg
-mode = 0644
 
 [pbsready-export]
 # An export instance has an exporter script, and communicates
@@ -55,29 +53,24 @@ mode = 0644
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/pbsready-export.cfg.in
 filename = pbsready-export.cfg.in
-mode = 0644
 
 [template-pull-backup]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
 output = ${buildout:directory}/instance-pull-backup.cfg
-mode = 0644
 
 [template-replicated]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template-replicated.cfg.in
-mode = 0644
 
 [template-parts]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/template-parts.cfg.in
-mode = 0644
 
 [template-resilient-templates]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}.in
 output = ${buildout:directory}/${:filename}
-mode = 0644
 filename = template-resilient-templates.cfg
 
 [instance-frozen]
@@ -92,32 +85,26 @@ output = ${buildout:directory}/instance-frozen.cfg
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/resilient-web-takeover-cgi-script.py.in
 filename = resilient-web-takeover-cgi-script.py.in
-mode = 0644
 
 # Provide an empty wrapper
 [template-wrapper]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/templates/wrapper.in
 output = ${buildout:directory}/template-wrapper.cfg
-mode = 0644
 
 [notifier-feed-promise-template]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/notifier-feed-promise.py.in
 filename = notifier-feed-promise.py.in
-mode = 0644
 
 ##################
 # Monitor element
 #
 
 [template-monitor-check-resilient-feed]
-recipe = hexagonit.recipe.download
-ignore-existing = true
+recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/monitor-check-resilient-feed.in
-download-only = true
 filename = monitor-check-resilient-feed.in
-mode = 0644
 
 [exporter-default-configuration]
 # Time in minutes to wait for the backup to finish

stack/resilient/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 8f15263c4a27ec315eb3a12dbf7a7b34
 
 [template-pull-backup]
 filename = instance-pull-backup.cfg.in
-md5sum = e7674770b85c983244255dd82642ebe8
+md5sum = d1af7f8a5d4f0846e4c016253fa31f3d
 
 [template-replicated]
 filename = template-replicated.cfg.in

stack/resilient/instance-pull-backup.cfg.in

@@ -270,7 +270,7 @@ private-path-list +=
 
 [monitor-check-resilient-feed-file]
 recipe = slapos.recipe.template:jinja2
-template = ${template-monitor-check-resilient-feed:location}/${template-monitor-check-resilient-feed:filename}
+template = ${template-monitor-check-resilient-feed:target}
 rendered = $${monitor-directory:bin}/check-create-resilient-feed-files
 mode = 700
 context =

stack/slapos.cfg

@@ -38,7 +38,6 @@ exec-sitecustomize = false
 # Add location for modified non-official slapos.buildout
 find-links +=
   http://www.nexedi.org/static/packages/source/
-  http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
   http://www.nexedi.org/static/packages/source/slapos.buildout/
 
 # Use only quite well working sites.
@@ -135,8 +134,6 @@ setuptools = 44.1.1
 zc.buildout = 2.7.1+slapos014
 # Use SlapOS patched zc.recipe.egg (zc.recipe.egg 2.x is for Buildout 2)
 zc.recipe.egg = 2.0.3+slapos003
-# Use own version of h.r.download to be able to open .xz and .lz archives
-hexagonit.recipe.download = 1.7.post4
 
 traitlets = 4.3.3
 Jinja2 = 2.11.3
@@ -190,13 +187,13 @@ setproctitle = 1.1.10
 setuptools-dso = 1.7
 rubygemsrecipe  = 0.4.3
 six = 1.12.0
-slapos.cookbook = 1.0.218
+slapos.cookbook = 1.0.220
 slapos.core = 1.6.19
 slapos.extension.strip = 0.4
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.20
 slapos.rebootstrap = 4.5
-slapos.recipe.build = 0.50
+slapos.recipe.build = 0.51
 slapos.recipe.cmmi = 0.18
 slapos.recipe.template = 4.6
 slapos.toolbox = 0.126

stack/supervisord/buildout.cfg

@@ -10,7 +10,6 @@ parts =
 
 [supervisord-download-base]
 recipe = slapos.recipe.build:download
-mode = 0644
 url = ${:_profile_base_location_}/${:_update_hash_filename_}