From d5076107ee3287b69b7f6bb195efdab9e73f8686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Tue, 27 Jan 2015 12:19:21 +0100
Subject: [PATCH] fixup! erp5: add periodicity for tidstorage/mariadb backup.

---
 stack/erp5/buildout.cfg            | 4 ++--
 stack/erp5/instance-mariadb.cfg.in | 4 ++--
 stack/erp5/instance.cfg.in         | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 7878bbe99..8062b7142 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -156,7 +156,7 @@ mode = 755
 [template-mariadb]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-mariadb.cfg.in
-md5sum = 48e8816d7d0c9e17585398fcf8e70347
+md5sum = c78c8a6445a5f67dca35c427ae370d84
 mode = 640
 
 [template-zope]
@@ -199,7 +199,7 @@ mode = 640
 # XXX: "template.cfg" is hardcoded in instanciation recipe
 filename = template.cfg
 template = ${:_profile_base_location_}/instance.cfg.in
-md5sum = 9ced9ebba770ba0b4e6ffe74c65770f5
+md5sum = 78aeabeb306178e4716b44ad6605c59c
 extra-context =
     key apache_location apache:location
     key aspell_location aspell:location
diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in
index b88375d30..acc1e4c80 100644
--- a/stack/erp5/instance-mariadb.cfg.in
+++ b/stack/erp5/instance-mariadb.cfg.in
@@ -1,5 +1,5 @@
 {% if software_type == slap_software_type -%}
-{% set json = json_module.loads(parameter_dict.get('mariadb-json', '{}')) -%}
+{% set json = json_module.loads(slapparameter_dict.get('mariadb-json', '{}')) -%}
 {% set backup_periodicity = json.get('backup-periodicity', '0 22 * * *') -%}
 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
 
@@ -42,7 +42,7 @@ command = mysqldump
 recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
 name = mariadb-backup
-frequency = ${slap-parameter:backup-periodicity}
+frequency = {{ backup_periodicity }}
 {# When binlogs are enabled:
 # flush-logs: used so no manipulation on binlogs is needed to restore from
 #   full + binlogs. The first binlog after a dump starts from dump snapshot and
diff --git a/stack/erp5/instance.cfg.in b/stack/erp5/instance.cfg.in
index 6020cc7c3..030df23b6 100644
--- a/stack/erp5/instance.cfg.in
+++ b/stack/erp5/instance.cfg.in
@@ -124,11 +124,15 @@ extra-context =
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type varnish
 
+[dynamic-template-mariadb-parameters]
+buildout-bin-directory = {{ buildout_bin_directory }}
+
 [dynamic-template-mariadb]
 < = jinja2-template-base
 template = {{ template_mariadb }}
 filename = instance-mariadb.cfg
 extra-context =
+    section parameter_dict dynamic-template-mariadb-parameters
     raw coreutils_location {{ coreutils_location }}
     raw dcron_location {{ dcron_location }}
     raw findutils_location {{ findutils_location }}
@@ -142,7 +146,6 @@ extra-context =
     raw perl_siteprefix {{ perl_siteprefix }}
     raw sed_location {{ sed_location }}
     raw xtrabackup_location {{ xtrabackup_location }}
-    raw buildout-bin-directory {{ buildout_bin_directory }}
     import json_module json
 # Must match the key id in [switch-softwaretype] which uses this section.
     raw software_type mariadb
-- 
2.30.9