From 560b8088319c48967320a351727ccf1ed6c5e072 Mon Sep 17 00:00:00 2001
From: Lukasz Nowak <luke@nexedi.com>
Date: Mon, 7 Oct 2019 13:15:48 +0200
Subject: [PATCH] software/nextcloud: Use buildout.hash.cfg

---
 software/nextcloud/buildout.hash.cfg | 29 ++++++++++++++++++++++++++++
 software/nextcloud/software.cfg      | 12 +++---------
 2 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 software/nextcloud/buildout.hash.cfg

diff --git a/software/nextcloud/buildout.hash.cfg b/software/nextcloud/buildout.hash.cfg
new file mode 100644
index 000000000..ac4572529
--- /dev/null
+++ b/software/nextcloud/buildout.hash.cfg
@@ -0,0 +1,29 @@
+# THIS IS NOT A BUILDOUT FILE, despite purposedly using a compatible syntax.
+# The only allowed lines here are (regexes):
+# - "^#" comments, copied verbatim
+# - "^[" section beginings, copied verbatim
+# - lines containing an "=" sign which must fit in the following categorie.
+#   - "^\s*filename\s*=\s*path\s*$" where "path" is relative to this file
+#     Copied verbatim.
+#   - "^\s*hashtype\s*=.*" where "hashtype" is one of the values supported
+#     by the re-generation script.
+#     Re-generated.
+# - other lines are copied verbatim
+# Substitution (${...:...}), extension ([buildout] extends = ...) and
+# section inheritance (< = ...) are NOT supported (but you should really
+# not need these here).
+[template-nextcloud-install.sh]
+filename = nextcloud-install.sh.in
+md5sum = a2281f86f6a26a8ff40a57a495505977
+
+[template-apache-httpd]
+filename = apache-httpd.conf.in
+md5sum = 839258624e273aac71a96516bf34c7e6
+
+[template-nextcloud-config.json]
+filename = nextcloud-config.json.in
+md5sum = fbc5eacda192cb02c8d9861cb628fe6f
+
+[template-nextcloud-instance]
+filename = nextcloud-instance.cfg.in
+md5sum = 59e9c65e655cf9cf144d97dd36863ede
diff --git a/software/nextcloud/software.cfg b/software/nextcloud/software.cfg
index 0f1e1c800..6207746b0 100644
--- a/software/nextcloud/software.cfg
+++ b/software/nextcloud/software.cfg
@@ -1,5 +1,6 @@
 [buildout]
 extends =
+  buildout.hash.cfg
   ../../component/redis/buildout.cfg
   ../../component/python3/buildout.cfg
   ../../stack/lamp/buildout.cfg
@@ -18,25 +19,18 @@ md5sum = d81902d2dec5d547779bec6336a438be
 
 [template-nextcloud-install.sh] 
 <= nc-download-base
-filename = nextcloud-install.sh.in
-md5sum = a2281f86f6a26a8ff40a57a495505977
 
 [template-apache-httpd]
 <= nc-download-base
-filename = apache-httpd.conf.in
-md5sum = 839258624e273aac71a96516bf34c7e6
 
 [template-nextcloud-config.json]
 <= nc-download-base
-filename = nextcloud-config.json.in
-md5sum = fbc5eacda192cb02c8d9861cb628fe6f
 
 [template-nextcloud-instance]
 recipe = slapos.recipe.template:jinja2
-template = ${:_profile_base_location_}/nextcloud-instance.cfg.in
+template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/instance-nextcloud.cfg
 extensions = jinja2.ext.do
-md5sum = 59e9c65e655cf9cf144d97dd36863ede
 context = 
           key gzip_location          gzip:location
           key python3_location       python3.6.6:location
@@ -56,4 +50,4 @@ part-list = nextcloud-install.sh
 recipe = hexagonit.recipe.download
 url = https://github.com/nextcloud/news-updater/archive/10.0.1.tar.gz
 md5sum = 37387199c0482e08d01e9294cd95eaad
-strip-top-level-dir = true
\ No newline at end of file
+strip-top-level-dir = true
-- 
2.30.9