Commit 3374ca65 authored by Marco Mariani's avatar Marco Mariani Committed by Kazuhiko Shiozaki

support for docservers_path parameter

parent 6778a54f
......@@ -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 =
......@@ -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
......
......@@ -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]
......
......@@ -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 =
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