From 0b21bcfcacb823a3d614c5507c0f93cd8b5f101f Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Wed, 13 Feb 2013 12:20:55 +0100
Subject: [PATCH] Update stunnel section to work with new version

---
 software/mariadb/instance-mariadb.cfg | 13 +++++++------
 software/mariadb/software.cfg         |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/software/mariadb/instance-mariadb.cfg b/software/mariadb/instance-mariadb.cfg
index ea3d59d..54d0c8f 100644
--- a/software/mariadb/instance-mariadb.cfg
+++ b/software/mariadb/instance-mariadb.cfg
@@ -18,7 +18,7 @@ offline = true
 
 [url]
 recipe = slapos.cookbook:publishurl
-url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-address}]:$${stunnel:remote-port}/$${mariadb:database}
+url = mysqls://$${mariadb:user}:$${mariadb:password}@[$${stunnel:remote-host}]:$${stunnel:remote-port}/$${mariadb:database}
 
 [mariadb]
 recipe = slapos.cookbook:mysql
@@ -92,10 +92,11 @@ key-file = $${ca-stunnel:key-file}
 cert-file = $${ca-stunnel:cert-file}
 pid-file = $${basedirectory:run}/stunnel.pid
 local-port = $${mariadb:port}
-local-address = $${mariadb:ip}
-remote-address = $${slap-network-information:global-ipv6}
+local-host = $${mariadb:ip}
+remote-host = $${slap-network-information:global-ipv6}
 remote-port = 6446
 client = false
+post-rotate-script = $${rootdirectory:bin}/stunnel_post_rotate
 
 [logrotate]
 recipe = slapos.cookbook:logrotate
@@ -128,13 +129,13 @@ dcrond-binary = ${dcron:location}/sbin/crond
 cron-entries = $${directory:cron-entries}
 crontabs = $${directory:crontabs}
 cronstamps = $${directory:cronstamps}
-catcher = $${cron-simplelogger:binary}
+catcher = $${cron-simplelogger:wrapper}
 binary = $${basedirectory:services}/crond
 
 [cron-simplelogger]
 recipe = slapos.cookbook:simplelogger
-binary = $${rootdirectory:bin}/cron_simplelogger
-output = $${directory:cronoutput}
+wrapper = $${rootdirectory:bin}/cron_simplelogger
+log = $${basedirectory:log}/crond.log
 
 [cron-entry-logrotate]
 <= cron
diff --git a/software/mariadb/software.cfg b/software/mariadb/software.cfg
index 3aa6009..62499be 100644
--- a/software/mariadb/software.cfg
+++ b/software/mariadb/software.cfg
@@ -48,7 +48,7 @@ mode = 0644
 [instance-mariadb]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-mariadb.cfg
-md5sum = 135ad8e59a45e053f3aaf75deb35c5b0
+md5sum = d160bb15d8d3a3913706a4ed29c49388
 output = ${buildout:directory}/template-mariadb.cfg
 mode = 0644
 
-- 
2.1.4