stack/lamp: Add changeable archive root

software/matomo/software.cfg

@@ -28,6 +28,7 @@ url = ${:_profile_base_location_}/${:filename}
 [application]
 url = https://builds.matomo.org/matomo-4.7.1.zip
 md5sum = 8d592676bc2c0d51363ad7b2caf171fe
+archive-root = matomo
 
 # give the location of the instance-matomo.cfg fil
 # Without it the instance-matomo.cfg file will not be executed

stack/lamp/apache-httpd.conf.in

 <VirtualHost *:{{ parameter_dict['port'] }}>
   ServerAdmin admin@example.com
-  DocumentRoot {{ parameter_dict['document-root'] }}/matomo
+  DocumentRoot {{ parameter_dict['document-root'] }}
 
   SetEnvIf Origin "^http(s)?://(.+\.)?(app\.officejs\.com)$" ORIGIN_DOMAIN=$0
   Header always set Access-Control-Allow-Origin "%{ORIGIN_DOMAIN}e" env=ORIGIN_DOMAIN

stack/lamp/buildout.cfg

@@ -37,6 +37,14 @@ url = ${:_profile_base_location_}/${:filename}
 
 [application]
 recipe = slapos.recipe.build:download-unpacked
+# softwares using this stack can extend this section to provide the url of
+# an archive containing the application using url and md5sum options.
+# The archive will be extracted directly in apache's DocumentRoot folder.
+# In case the archive contain multiple files and folders and only a
+# specific folder should be used as DocumentRoot, archive-root can be
+# set to the relative path of this folder.
+archive-root =
+
 
 [python]
 part = python3
@@ -67,6 +75,7 @@ output = ${buildout:directory}/instance.cfg
 url = ${:_profile_base_location_}/${:filename}
 context =
     key application_location application:location
+    key application_archive_root application:archive-root
     key application_deployment_part_list custom-application-deployment:part-list
     key apache_location apache:location
     key apache_php_location apache-php:location

stack/lamp/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance]
 filename = instance.cfg.in
-md5sum = b87556b0e5651bc8217c1bccbdd6b4d7
+md5sum = 603d03f43ea04e95237c80d3b9e72ba7
 
 [instance-apache-php]
 filename = instance-apache-php.cfg.in
@@ -34,4 +34,4 @@ md5sum = 980f603c34fcb008ce73a9dde2dbceb3
 
 [template-apache-httpd]
 filename = apache-httpd.conf.in
-md5sum = cf74249158ebb26e5ff7d3c9208f88d4
+md5sum = 4ad906791f0d6fd3a4aef8f5a8018b45

stack/lamp/instance.cfg.in

@@ -54,7 +54,11 @@ extra-context =
   raw db_password {{ db_password }}
 
 [dynamic-template-apache-php-parameters]
+{% if application_archive_root %}
+application-location = {{ application_location }}/{{ application_archive_root }}
+{% else %}
 application-location = {{ application_location }}
+{% endif %}
 application-part-list = {{ application_deployment_part_list }}
 template-apache-conf = {{ template_apache_conf }}
 apache-location = {{ apache_location }}