Simplify and fix aprts of exporters/importer.

Fix aac29aa6.
parts+= *is* *a* *nightmare*.
parent 625a8783
......@@ -12,8 +12,23 @@ extends = {{templateapache}}
parts +=
{{ parts.replicate("mariadb", "3") }}
# have to repeat the next one, as it's not inherited from pbsready-export
cron-entry-backup
# Repeating parts from instance-apache-php.
# XXX-Cedric: how to simplify this?
certificate-authority
ca-stunnel
logrotate
logrotate-entry-apache
logrotate-entry-stunnel
cron
cron-entry-logrotate
promise
slapmonitor
slapmonitor-xml
frontend-promise
content-promise
publish-connection-informations
{{ replicated.replicate("mariadb", "3", "mariadb-export", "mariadb-import") }}
......
......@@ -95,7 +95,7 @@ context = key templateapache instance-apache-php:output
import-list = file parts template-parts:destination
file replicated template-replicated:destination
md5sum = fb5c121e8d6ab4a23d22d2bd23b6f445
md5sum = 6647004fd5a2a3d74e3d7f8aa6b4b226
mode = 0644
[instance-resilient]
......@@ -124,14 +124,14 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-import.cfg.in
output = ${buildout:directory}/instance-mariadb-import.cfg
md5sum = 8009627bb669d1fee0df030daa8d3bdc
md5sum = faf5826f4b27e362f34ad17db54b8c9a
mode = 0644
[instance-mariadb-export]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/mariadb/instance-mariadb-export.cfg.in
output = ${buildout:directory}/instance-mariadb-export.cfg
md5sum = 0513bf25fbb20cccd57f285c40d96498
md5sum = 13703a15d9d73f59598505dac8ed4967
mode = 0644
......
......@@ -2,13 +2,21 @@
extends = ${instance-mariadb:output}
${pbsready-export:output}
# Repeating parts from instance-mariadb.
parts +=
urls
mariadb
# have to repeat the next one, as it's not inherited from pbsready-export
cron-entry-backup
stunnel
certificate-authority
ca-stunnel
logrotate
logrotate-entry-mariadb
logrotate-entry-stunnel
logrotate-entry-cron
cron
cron-entry-logrotate
slapmonitor
slapmonitor-xml
[exporter]
recipe = slapos.cookbook:mydumper
......
......@@ -2,13 +2,6 @@
extends = ${instance-mariadb:output}
${pbsready-import:output}
parts +=
mariadb
# have to repeat the next one, as it's not inherited from pbsready-import
import-on-notification
[importer]
recipe = slapos.cookbook:mydumper
wrapper = $${rootdirectory:bin}/myloader
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment