From 29303c514b58b1ae2c12db9f0955c2e6a91fb59d Mon Sep 17 00:00:00 2001 From: Marco Mariani <marco.mariani@nexedi.com> Date: Wed, 13 Mar 2013 15:03:14 +0100 Subject: [PATCH] support for docservers_path parameter --- software/maarch/instance-custom.cfg.in | 2 ++ software/maarch/software.cfg | 2 +- stack/lapp/buildout.cfg | 2 +- stack/lapp/instance-resilient.cfg.jinja2 | 6 ++++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/software/maarch/instance-custom.cfg.in b/software/maarch/instance-custom.cfg.in index eb749d905..0ea50b578 100644 --- a/software/maarch/instance-custom.cfg.in +++ b/software/maarch/instance-custom.cfg.in @@ -13,6 +13,7 @@ php-ini = $${directory:php-ini-dir}/php.ini root-docservers = $${buildout:directory}/srv/docservers dependency = $${apache-php:recipe} maarch-sql-data-file = $${slap-parameter:maarch-sql-data-file} +maarch-docservers-path = $${slap-parameter:maarch-docservers-path} [publish-connection-informations] # XXX login should not be hardcoded @@ -21,4 +22,5 @@ password = $${maarch-configuration:db-password} [slap-parameter] maarch-sql-data-file = +maarch-docservers-path = diff --git a/software/maarch/software.cfg b/software/maarch/software.cfg index 084da0014..24ed8d48e 100644 --- a/software/maarch/software.cfg +++ b/software/maarch/software.cfg @@ -40,7 +40,7 @@ part-list = maarch-configuration recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-custom.cfg.in output = ${buildout:directory}/instance-custom.cfg -md5sum = f86b311d443156e327a1b5f5acfb22b1 +md5sum = ba84bd1b02bf555ab1152a1d74aaf2a7 mode = 0644 diff --git a/stack/lapp/buildout.cfg b/stack/lapp/buildout.cfg index 36c518cb8..08b4f15c3 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 = 16490b8b0807d62826a4350a3b4510c1 +md5sum = a5ff7e8fbd7d14603ec6f4da9226ded8 mode = 0644 [instance-postgres] diff --git a/stack/lapp/instance-resilient.cfg.jinja2 b/stack/lapp/instance-resilient.cfg.jinja2 index 7613322a9..d906cd665 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 maarch-sql-data-file +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 maarch-sql-data-file maarch-docservers-path 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} @@ -28,6 +28,7 @@ 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-maarch-sql-data-file = ${slap-parameter:maarch-sql-data-file} +config-maarch-docservers-path = ${slap-parameter:maarch-docservers-path} [publish-connection-informations] recipe = slapos.cookbook:publish @@ -46,5 +47,6 @@ 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 +# the following parameters are specific to maarch maarch-sql-data-file = +maarch-docservers-path = -- 2.30.9