From f43144ed9a6b6d84b73cc3f8f012651831adbcbf Mon Sep 17 00:00:00 2001 From: Marco Mariani <marco.mariani@nexedi.com> Date: Tue, 12 Mar 2013 15:41:10 +0100 Subject: [PATCH] support for sql-data-file parameter --- software/maarch/instance-custom.cfg.in | 5 +++++ software/maarch/software.cfg | 2 +- stack/lapp/buildout.cfg | 2 +- stack/lapp/instance-resilient.cfg.jinja2 | 5 ++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/software/maarch/instance-custom.cfg.in b/software/maarch/instance-custom.cfg.in index 2040e6661..2e0653c00 100644 --- a/software/maarch/instance-custom.cfg.in +++ b/software/maarch/instance-custom.cfg.in @@ -12,8 +12,13 @@ language = en php_ini = $${directory:php-ini-dir}/php.ini root_docservers = $${buildout:directory}/srv/docservers dependency = $${apache-php:recipe} +sql-data-file = $${slap-parameter:sql-data-file} [publish-connection-informations] # XXX login should not be hardcoded login = superadmin password = $${maarch-configuration:db_password} + +[slap-parameter] +sql-data-file = + diff --git a/software/maarch/software.cfg b/software/maarch/software.cfg index 3f3aafb22..f0e96f002 100644 --- a/software/maarch/software.cfg +++ b/software/maarch/software.cfg @@ -63,7 +63,7 @@ part-list = maarch-configuration recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-custom.cfg.in output = ${buildout:directory}/instance-custom.cfg -md5sum = d1b02a8c571886a225f2f1c8da06286c +md5sum = 2b5888a29f3bfccb76c192e4a9f17c5b mode = 0644 diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg index 1db83bf9b..a80670e57 100644 --- a/stack/lapp/buildout.cfg +++ b/stack/lapp/buildout.cfg @@ -98,7 +98,7 @@ context = key buildout buildout:bin-directory import-list = file parts template-parts:destination file replicated template-replicated:destination -md5sum = 2eaa5130bf822c4a992462861626cf01 +md5sum = 06c682f39f6487bc6e944c5b047bc657 mode = 0644 [instance-postgres] diff --git a/stack/lapp/instance-resilient.cfg.jinja2 b/stack/lapp/instance-resilient.cfg.jinja2 index 5f016a2a9..a49f423ba 100644 --- a/stack/lapp/instance-resilient.cfg.jinja2 +++ b/stack/lapp/instance-resilient.cfg.jinja2 @@ -19,7 +19,7 @@ parts += [request-apache] return = url ssh-public-key ssh-url notification-id ip url backend_url # XXX: hardcoded values -config = domain number authorized-key notify ip-list namebase postgres1-computer-guid pbs-postgres1-computer-guid postgres2-computer-guid pbs-postgres2-computer-guid postgres3-computer-guid pbs-postgres3-computer-guid +config = domain number authorized-key notify ip-list namebase postgres1-computer-guid pbs-postgres1-computer-guid postgres2-computer-guid pbs-postgres2-computer-guid postgres3-computer-guid pbs-postgres3-computer-guid sql-data-file config-postgres1-computer-guid = ${slap-parameter:postgres1-computer-guid} config-pbs-postgres1-computer-guid = ${slap-parameter:pbs-postgres1-computer-guid} config-postgres2-computer-guid = ${slap-parameter:postgres2-computer-guid} @@ -27,6 +27,7 @@ config-pbs-postgres2-computer-guid = ${slap-parameter:pbs-postgres2-computer-gui config-postgres3-computer-guid = ${slap-parameter:postgres3-computer-guid} config-pbs-postgres3-computer-guid = ${slap-parameter:pbs-postgres3-computer-guid} config-domain = ${slap-parameter:domain} +config-sql-data-file = ${slap-parameter:sql-data-file} [publish-connection-informations] recipe = slapos.cookbook:publish @@ -45,3 +46,5 @@ postgres3-computer-guid = pbs-postgres3-computer-guid = # XXX-Cedric: Hardcoded parameters. Should be dynamically generated. domain = +# the sql-data-file parameter is specific to maarch +sql-data-file = -- 2.30.9