Update Release Candidate

component/diffutils/buildout.cfg

+[buildout]
+extends =
+  ../xz-utils/buildout.cfg
+parts =
+  diffutils
+
+[diffutils]
+recipe = slapos.recipe.cmmi
+shared = true
+url = https://ftp.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz
+md5sum = 6a6b0fdc72acfe3f2829aab477876fbc
+environment =
+  PATH=${xz-utils:location}/bin:%(PATH)s
+
+
+

component/serf/buildout.cfg

@@ -5,6 +5,7 @@ extends =
   ../apache/buildout.cfg
   ../util-linux/buildout.cfg
   ../openssl/buildout.cfg
+  ../python-2.7/buildout.cfg
   ../zlib/buildout.cfg
 
 [serf]
@@ -13,7 +14,7 @@ shared = true
 url = https://archive.apache.org/dist/serf/serf-1.3.9.tar.bz2
 md5sum = 370a6340ff20366ab088012cd13f2b57
 scons-command =
-  python ${scons:location}/scons.py \
+  ${python2.7:location}/bin/python ${scons:location}/scons.py \
   APR="${apr:location}" \
   APU="${apr-util:location}" \
   OPENSSL="${openssl:location}" \

software/matomo/buildout.hash.cfg

@@ -19,8 +19,8 @@ md5sum = 9940e05d5e624a7884f4e6e062355798
 
 [template-matomo-instance]
 filename = matomo-instance.cfg.in
-md5sum = cd5d8b83fef478b2fbb4ccc9489f47ed
+md5sum = 34925db56b5f97e5a29080fb83fbefa8
 
 [template-matomo-backup.sh]
 filename = matomo-backup.sh.in
-md5sum = d11e34a576e580d4253fbe787f85e5cc
+md5sum = fb29ad59813ef62c3f5934d4a0d90e14

software/matomo/matomo-backup.sh.in

-#!/bin/bash
+#!/bin/sh
 
 set -e
 set -x
@@ -13,20 +13,37 @@ if [ ! -f {{ parameter_dict['document-root'] }}/matomo/config/config.ini.php ];
   exit 0;
 fi
 
-#create plugins backup file
-touch {{ parameter_dict['dir-backup'] }}/plugins_list
+trap 'rm -rf "$TMPFILE"' EXIT TERM INT
 
-#remove backup file before
-if [ -d {{ parameter_dict['dir-backup'] }}/config ]; then     
-  rm -rf {{ parameter_dict['dir-backup'] }}/config   
-fi  
-
-if [ -d {{ parameter_dict['dir-backup'] }}/plugins ]; then     
-  rm -rf {{ parameter_dict['dir-backup'] }}/plugins   
-fi    
+#we reserve backup folder in a month
+{{ parameter_dict['find-bin'] }}/bin/find {{ parameter_dict['dir-backup'] }} -mtime +30 -type d |{{ parameter_dict['find-bin'] }}/bin/xargs rm -rf
 
 #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'] }}
+
+TMPFILE=$(mktemp -d -p "{{ parameter_dict['dir-backup'] }}")
+
+{{ php_bin }} {{ parameter_dict['document-root'] }}/matomo/console plugin:list > $TMPFILE/plugins_list
+cp -rf {{ parameter_dict['document-root'] }}/matomo/config $TMPFILE/config
+cp -rf {{ parameter_dict['document-root'] }}/matomo/plugins $TMPFILE/plugins
+
+#check if copy-action finish well
+
+if test ! -z "$({{ parameter_dict['diff-bin'] }}/bin/diff -r $TMPFILE/config {{ parameter_dict['document-root'] }}/matomo/config)"; then
+  exit 1
+fi
+
+if test ! -z "$({{ parameter_dict['diff-bin'] }}/bin/diff -r $TMPFILE/plugins {{ parameter_dict['document-root'] }}/matomo/plugins)"; then
+  exit 1
+fi
+
+#check if the file plugins_list has been created
+if [ ! -f $TMPFILE/plugins_list ]; then
+  exit 1
+fi
+
+#if all things go well, change the name of folder with date now
+if [ -d $TMPFILE ]; then
+  mv -f $TMPFILE {{ parameter_dict['dir-backup'] }}/`date +%m-%d-%Y-%T`
+fi
+
 exit 0

software/matomo/matomo-instance.cfg.in

@@ -2,6 +2,8 @@
 [instance-parameter]
 matomo = ${:document-root}
 dir-backup = ${directory:backup}
+find-bin = {{ findutils_location }}
+diff-bin = {{ diffutils_location }}
 
 #php.ini parameters
 php.memory_limit = 512M
@@ -17,7 +19,7 @@ php.max_file_uploads = 100
 [php-bin]
 recipe = slapos.cookbook:wrapper
 wrapper-path = ${directory:bin}/php
-command-line = ${instance-parameter:php-bin} -c ${php.ini-conf:rendered} 
+command-line = ${instance-parameter:php-bin} -c ${php.ini-conf:rendered}
 
 [matomo-backup-cron]
 recipe = slapos.cookbook:cron.d
@@ -40,9 +42,6 @@ rendered = ${directory:scripts}/matomo-backup
 context =
   section parameter_dict instance-parameter
   key php_bin php-bin:wrapper-path
-depends =
-  ${matomo-apache-httpd:recipe}
-  ${matomo-backup-cron:recipe}
 
 [slap-parameter]
 instance.cli-url = ${apache-php-configuration:url}

software/matomo/software.cfg

 [buildout]
 extends =
   buildout.hash.cfg
-#apache-php mariadb zilb ...
+# LAMP stands for Linux, Apache, MySQL, PHP
   ../../stack/lamp/buildout.cfg
 # "slapos" stack describes basic things needed for 99.9% of SlapOS Software
   ../../stack/slapos.cfg
-  
+
+  ../../component/diffutils/buildout.cfg
+
 parts =
 # Call installation of slapos.cookbook egg defined in stack/slapos.cfg (needed
 # in 99,9% of Slapos Software Releases)
@@ -15,6 +17,10 @@ parts =
 # to create file instance.cfg of all instances
   instance
 
+#to make sure we use python3
+[python]
+part = python3
+
 # download bas
 # inherited by modules that need to download files
 [matomo-download]
@@ -31,7 +37,7 @@ md5sum = 8d592676bc2c0d51363ad7b2caf171fe
 # Without it the instance-matomo.cfg file will not be executed
 [custom-application-deployment]
 path = ${template-matomo-instance:rendered}
-part-list = matomo-backup.sh
+part-list = matomo-backup.sh matomo-backup-cron matomo-apache-httpd
 
 [template-matomo-instance]
 recipe = slapos.recipe.template:jinja2
@@ -39,6 +45,8 @@ template = ${:_profile_base_location_}/${:filename}
 rendered = ${buildout:directory}/instance-matomo.cfg
 extensions = jinja2.ext.do
 context =
+          key findutils_location findutils:location
+          key diffutils_location diffutils:location
           key gzip_location gzip:location
           key python3_location python3:location
           key php_location apache-php:location
@@ -50,7 +58,7 @@ context =
 <= matomo-download
 
 # download matomo-backup.sh.in
-[template-matomo-backup.sh] 
+[template-matomo-backup.sh]
 <= matomo-download