From 2965b94349ce2ee8c431dd1378ffd3b8b80ca5f9 Mon Sep 17 00:00:00 2001
From: Antoine Catton <acatton@tiolive.com>
Date: Tue, 27 Sep 2011 15:52:03 +0200
Subject: [PATCH] Pin on newer versions.
Conflicts:
software/mariadb/software.cfg
---
software/davstorage/software.cfg | 4 ++--
software/mariadb/instance.cfg | 1 +
software/mariadb/software.cfg | 8 +++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/software/davstorage/software.cfg b/software/davstorage/software.cfg
index 96dc4595c..e925ad6e1 100644
--- a/software/davstorage/software.cfg
+++ b/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:
diff --git a/software/mariadb/instance.cfg b/software/mariadb/instance.cfg
index bc82e6ef1..98d19d488 100644
--- a/software/mariadb/instance.cfg
+++ b/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
diff --git a/software/mariadb/software.cfg b/software/mariadb/software.cfg
index 16bc40eb5..df8d8786c 100644
--- a/software/mariadb/software.cfg
+++ b/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
--
2.30.9