software/backupserver: Update rdiff-backup version

Use Python 3 by default

software/backupserver/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 851262d7174da868805cb7c8e1ced7c0
 
 [template-backup-script]
 filename = template-backup-script.sh.in
-md5sum = 3f3286347a7e271e7bfa66e1a840989b
+md5sum = 98e9b840497f4cce62e2b60928e063a3
 
 [template-crontab-line]
 filename = template-crontab-line.in
@@ -46,7 +46,7 @@ md5sum = ae4a0043414336a521b524d9c95f1c68
 
 [template-pullrdiffbackup]
 filename = instance-pullrdiffbackup.cfg.in
-md5sum = 931038cfa23216af1628b960a2e10de6
+md5sum = 25f77031911fa97dbda44377690392d0
 
 [template]
 filename = instance.cfg.in

software/backupserver/instance-pullrdiffbackup.cfg.in

@@ -60,7 +60,7 @@ logfile = $${directory:log}/crond.log
 {%   set exclude = slave_instance.get('exclude', '') -%}
 {%   set exclude_string = '' -%}
 {%   set sudo = slave_instance.get('sudo', 'False') -%}
-{%   set remote_schema = slave_instance.get('remote_rdiff_path', 'rdiff-backup') + ' --server --restrict-read-only / -- "$@"' -%}
+{%   set remote_schema = slave_instance.get('remote_rdiff_path', 'rdiff-backup') + ' server --restrict-mode read-only --restrict-path / -- "$@"' -%}
 
 {%   if (exclude != '') -%}
 {%     set exclude_string = "' --exclude='".join(exclude.split(' ')) -%}

software/backupserver/software.cfg

@@ -27,9 +27,6 @@ parts =
   template-crontab-line
   slapos-cookbook
 
-[python]
-part = python2.7
-
 [rssgen-eggs]
 recipe = zc.recipe.egg
 interpreter = python-${:_buildout_section_name_}

software/backupserver/template-backup-script.sh.in

@@ -21,12 +21,12 @@ ${util-linux:location}/bin/flock $${:status_log}.lock \
   $${:connection}::/ ./
 
 RESULT=$?
- 
+
 # Inform about backup status
 if [ $RESULT -eq 0 ]
 then
   ${coreutils-output:echo} "`${coreutils-output:date} --iso-8601=seconds -u`, $${:statistic_log}, $${:hostname}, backup success" >> $${:status_log}
-  ${findutils-output:find} rdiff-backup-data/ -maxdepth 1 -name "session_statistic*" | ${coreutils-output:sort} | ${coreutils-output:tail} -n 1 | ${findutils-output:xargs} ${rdiff-backup-1.0.5:location}/bin/rdiff-backup --calculate-average > $${:statistic_log}
+  ${findutils-output:find} rdiff-backup-data/ -maxdepth 1 -name "session_statistic*" | ${coreutils-output:sort} | ${coreutils-output:tail} -n 1 | ${findutils-output:xargs} ${rdiff-backup-2.2.4:location}/bin/rdiff-backup calculate --method average > $${:statistic_log}
 else
   ${coreutils-output:echo} "`${coreutils-output:date} --iso-8601=seconds -u`, $${:statistic_log}, $${:hostname}, backup failed" >> $${:status_log}
 fi