software/backupserver: specify rdiff-backup version in the single place.

software/backupserver/agent/software.cfg

@@ -3,4 +3,4 @@ extends =
   ../software.cfg
 
 parts =
-  rdiff-backup-1.0.5
+  rdiff-backup

software/backupserver/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 851262d7174da868805cb7c8e1ced7c0
 
 [template-backup-script]
 filename = template-backup-script.sh.in
-md5sum = 3f3286347a7e271e7bfa66e1a840989b
+md5sum = 43b92958f34d5ca84e708bace817b971
 
 [template-crontab-line]
 filename = template-crontab-line.in

software/backupserver/software.cfg

@@ -30,6 +30,9 @@ parts =
   template-crontab-line
   slapos-cookbook
 
+[rdiff-backup]
+<= rdiff-backup-1.0.5
+
 [rssgen-eggs]
 recipe = zc.recipe.egg
 interpreter = python-${:_buildout_section_name_}

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

@@ -13,7 +13,7 @@ ${coreutils-output:echo} "Available only if backup succeed." > $${:statistic_log
 # set -e
 cd $${:datadirectory}
 ${util-linux:location}/bin/flock $${:status_log}.lock \
-  ${rdiff-backup-1.0.5:location}/bin/rdiff-backup \
+  ${rdiff-backup:location}/bin/rdiff-backup \
   $${:exclude_string} \
   --include='$${:include}' \
   --exclude='**' \
@@ -26,7 +26,7 @@ RESULT=$?
 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:location}/bin/rdiff-backup --calculate-average > $${:statistic_log}
 else
   ${coreutils-output:echo} "`${coreutils-output:date} --iso-8601=seconds -u`, $${:statistic_log}, $${:hostname}, backup failed" >> $${:status_log}
 fi