software/slapos-sr-testing: enable test for matomo

software/matomo/buildout.hash.cfg

@@ -19,8 +19,8 @@ md5sum = 9940e05d5e624a7884f4e6e062355798
 
 [template-matomo-instance]
 filename = matomo-instance.cfg.in
-md5sum = 4a4deb475f7e55f03d95fbd30eeb4cf0
+md5sum = cd5d8b83fef478b2fbb4ccc9489f47ed
 
 [template-matomo-backup.sh]
 filename = matomo-backup.sh.in
-md5sum = 97ff3dad61818632150fe49df9593419
+md5sum = d11e34a576e580d4253fbe787f85e5cc

software/matomo/matomo-backup.sh.in

@@ -14,19 +14,19 @@ if [ ! -f {{ parameter_dict['document-root'] }}/matomo/config/config.ini.php ];
 fi
 
 #create plugins backup file
-touch {{ dir_backup }}/plugins_list
+touch {{ parameter_dict['dir-backup'] }}/plugins_list
 
 #remove backup file before
-if [ -d {{ dir_backup }}/config ]; then     
-  rm -rf {{ dir_backup }}/config   
+if [ -d {{ parameter_dict['dir-backup'] }}/config ]; then     
+  rm -rf {{ parameter_dict['dir-backup'] }}/config   
 fi  
 
-if [ -d {{ dir_backup }}/plugins ]; then     
-  rm -rf {{ dir_backup }}/plugins   
+if [ -d {{ parameter_dict['dir-backup'] }}/plugins ]; then     
+  rm -rf {{ parameter_dict['dir-backup'] }}/plugins   
 fi    
 
 #backup
-{{ php_bin }} {{ parameter_dict['document-root'] }}/matomo/console plugin:list > {{ dir_backup }}/plugins_list
-cp -rf {{ parameter_dict['document-root'] }}/matomo/config {{ dir_backup }}
-cp -rf {{ parameter_dict['document-root'] }}/matomo/plugins {{ dir_backup }}
+{{ php_bin }} {{ parameter_dict['document-root'] }}/matomo/console plugin:list > {{ parameter_dict['dir-backup'] }}/plugins_list
+cp -rf {{ parameter_dict['document-root'] }}/matomo/config {{ parameter_dict['dir-backup'] }}
+cp -rf {{ parameter_dict['document-root'] }}/matomo/plugins {{ parameter_dict['dir-backup'] }}
 exit 0

software/matomo/matomo-instance.cfg.in

@@ -13,7 +13,6 @@ php.max_execution_time = 1800
 php.max_input_time = 3600
 php.output_buffering = 'Off'
 php.max_file_uploads = 100
-dir-temp = ${directory:tmp}
 
 [php-bin]
 recipe = slapos.cookbook:wrapper
@@ -40,7 +39,6 @@ template = {{ matomo_backup_sh }}
 rendered = ${directory:scripts}/matomo-backup
 context =
   section parameter_dict instance-parameter
-  key dir_backup instance-parameter:dir-backup
   key php_bin php-bin:wrapper-path
 depends =
   ${matomo-apache-httpd:recipe}

software/matomo/software.cfg

@@ -49,7 +49,7 @@ context =
 [template-apache-httpd]
 <= matomo-download
 
-# download matomo-install.sh.in
+# download matomo-backup.sh.in
 [template-matomo-backup.sh] 
 <= matomo-download
 

software/slapos-sr-testing/software-py3.cfg

@@ -25,3 +25,4 @@ extra =
   restic-rest-server ${slapos.test.restic_rest_server-setup:setup}
   headless-chromium ${slapos.test.headless-chromium-setup:setup}
   hugo ${slapos.test.hugo-setup:setup}
+  matomo ${slapos.test.matomo-setup:setup}

software/slapos-sr-testing/software.cfg

@@ -145,6 +145,12 @@ setup = ${slapos-repository:location}/software/html5as-base/test/
 egg = slapos.test.hugo
 setup = ${slapos-repository:location}/software/hugo/test/
 
+[slapos.test.matomo-setup]
+<= setup-develop-egg
+egg = slapos.test.matomo
+setup = ${slapos-repository:location}/software/matomo/test/
+
+
 [slapos.test.jupyter-setup]
 <= setup-develop-egg
 egg = slapos.test.jupyter
@@ -282,6 +288,7 @@ extra-eggs =
   ${slapos.test.headless-chromium-setup:egg}
   ${slapos.test.erp5testnode-setup:egg}
   ${slapos.test.hugo-setup:egg}
+  ${slapos.test.matomo-setup:egg}
 
 # We don't name this interpreter `python`, so that when we run slapos node
 # software, installation scripts running `python` use a python without any