software/nextcloud: download apps in "slapos node software" step

Apps where downloaded during "slapos node instance" step, which has several
problems:
 - first, instance step is not supposed to require network access
 - this was downloading "latest" version of the app, which made the software
   not reproductible
 - since a few weeks this was no longer working, as we could see in test results

software/nextcloud/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [template-nextcloud-install.sh]
 filename = nextcloud-install.sh.in
-md5sum = 209abce3f82706fb80995f7efea70a9c
+md5sum = 094c26b177fdde69b41d81b89bab542b
 
 [template-apache-httpd]
 filename = apache-httpd.conf.in
@@ -26,4 +26,4 @@ md5sum = 6f42f0a8c5e5c0c657541a65c4d9ee57
 
 [template-nextcloud-instance]
 filename = nextcloud-instance.cfg.in
-md5sum = b62f438d380363387fe225fa3d7e2291
+md5sum = 86a92f542e516ac92802908b85354073

software/nextcloud/nextcloud-install.sh.in

@@ -125,12 +125,11 @@ array (
 );
 EOF
 
-# Install some nextcloud app
-php_cmd {{ parameter_dict['nextcloud'] }}/occ app:install spreed
-php_cmd {{ parameter_dict['nextcloud'] }}/occ app:install richdocuments
-php_cmd {{ parameter_dict['nextcloud'] }}/occ app:install calendar
-php_cmd {{ parameter_dict['nextcloud'] }}/occ app:install rainloop
-php_cmd {{ parameter_dict['nextcloud'] }}/occ app:install news
+# Install some nextcloud apps
+{%for app_name, app_location in nextcloud_apps.items() %}
+  cp -a {{ app_location }} {{ parameter_dict['nextcloud'] }}/apps/{{ app_name }}
+  php_cmd {{ parameter_dict['nextcloud'] }}/occ app:enable {{ app_name }}
+{%endfor%}
 
 php_cmd {{ parameter_dict['nextcloud'] }}/occ config:app:set richdocuments wopi_url --value="{{ parameter_dict.get('collabora-url', '') }}"
 php_cmd {{ parameter_dict['nextcloud'] }}/occ config:app:set spreed stun_servers --value="[\"{{ parameter_dict['stun-server'] }}\"]"

software/nextcloud/nextcloud-instance.cfg.in

@@ -86,6 +86,7 @@ template = {{ nextcloud_install_sh }}
 rendered = ${directory:scripts}/nextcloud-install
 context =
   section parameter_dict   instance-parameter
+  section nextcloud_apps   nextcloud-apps
 mode = 744
 depends =
   ${service-redis:recipe}
@@ -98,6 +99,11 @@ depends =
   ${nextcloud-config-update:recipe}
   ${nextcloud-install-promise:name}
 
+[nextcloud-apps]
+{% for app_name, app_location in nextcloud_apps.items() %}
+{{ app_name }} = {{ app_location }}
+{%endfor%}
+
 [nextcloud-install-promise]
 <= monitor-promise-base
 module = check_command_execute

software/nextcloud/software.cfg

@@ -40,6 +40,7 @@ context =
           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}
+          section nextcloud_apps     nextcloud-apps
 
 [custom-application-deployment]
 path = ${template-nextcloud-instance:rendered}
@@ -50,3 +51,40 @@ recipe = hexagonit.recipe.download
 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
+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
+url = https://github.com/nextcloud/richdocuments/releases/download/v3.7.17/richdocuments.tar.gz
+md5sum = 5559cd14a4a0a93d2a39b260538839f8
+
+[nextcloud-app-calendar]
+<= nc-download-app
+url = https://github.com/nextcloud/calendar/releases/download/v1.7.3/calendar.tar.gz
+md5sum = ab398d943eb6939e3e71df5b1a1abf87
+
+[nextcloud-app-rainloop]
+<= nc-download-app
+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
+url = https://github.com/nextcloud/news/releases/download/14.2.2/news.tar.gz
+md5sum = d0f4b355a3609c159ed12dfa55ca5109
+
+[nextcloud-apps]
+spreed = ${nextcloud-app-spreed:location}
+richdocuments = ${nextcloud-app-richdocuments:location}
+calendar = ${nextcloud-app-calendar:location}
+rainloop = ${nextcloud-app-rainloop:location}
+news = ${nextcloud-app-news:location}