Pin on newer versions.

Conflicts:

	software/mariadb/software.cfg

software/davstorage/software.cfg

@@ -63,14 +63,14 @@ mode = 0644
 python = python2.7
 
 [versions]
-zc.buildout = 1.5.3-dev-SlapOS-009
+zc.buildout = 1.5.3-dev-SlapOS-010
 Jinja2 = 2.6
 Werkzeug = 0.7.1
 buildout-versions = 1.6
 hexagonit.recipe.cmmi = 1.5.0
 hexagonit.recipe.download = 1.5.0
 meld3 = 0.6.7
-slapos.cookbook = 0.24
+slapos.cookbook = 0.26
 slapos.recipe.template = 1.1
 
 # Required by:

software/mariadb/instance.cfg

@@ -17,3 +17,4 @@ mysqldump_binary = ${mariadb:location}/bin/mysqldump
 openssl_binary = ${openssl:location}/bin/openssl
 stunnel_binary = ${stunnel:location}/bin/stunnel
 gzip_binary = ${gzip:location}/bin/gzip
+duplicity_binary = ${buildout:bin-directory}/duplicity

software/mariadb/software.cfg

@@ -14,6 +14,7 @@ extends =
   ../../component/python-2.7/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/gzip/buildout.cfg
+  ../../component/duplicity/buildout.cfg
   ../../stack/shacache-client.cfg
 
 # Use only quite well working sites.
@@ -38,6 +39,7 @@ parts =
   eggs
   gzip
   instance-recipe-egg
+  duplicity
 
 # XXX: Workaround of SlapOS limitation
 # Unzippig of eggs is required, as SlapOS do not yet provide nicely working
@@ -68,13 +70,13 @@ eggs =
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = bc6cfa74b8b80879e9564f18ce1e3791
+md5sum = 3cb8c08a90d4c379e1efdd5ef4ef030a
 output = ${buildout:directory}/template.cfg
 mode = 0644
 dollar = $
 
 [versions]
-slapos.cookbook = 0.25
+slapos.cookbook = 0.26
 
 # Required by slapos.cookbook==0.25
 slapos.core = 0.4
@@ -88,4 +90,4 @@ hexagonit.recipe.download = 1.5.0
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-009
+zc.buildout = 1.5.3-dev-SlapOS-010