Commit 6778a54f authored by Marco Mariani's avatar Marco Mariani Committed by Kazuhiko Shiozaki

renamed parameter sql-data-file -> maarch-sql-data-file

parent 452c6623
......@@ -12,7 +12,7 @@ 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}
maarch-sql-data-file = $${slap-parameter:maarch-sql-data-file}
[publish-connection-informations]
# XXX login should not be hardcoded
......@@ -20,5 +20,5 @@ login = superadmin
password = $${maarch-configuration:db-password}
[slap-parameter]
sql-data-file =
maarch-sql-data-file =
......@@ -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 = 6d73f8a9d47abe3146adadcab4f0bfb0
md5sum = f86b311d443156e327a1b5f5acfb22b1
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 = 06c682f39f6487bc6e944c5b047bc657
md5sum = 16490b8b0807d62826a4350a3b4510c1
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 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
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,7 +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}
config-maarch-sql-data-file = ${slap-parameter:maarch-sql-data-file}
[publish-connection-informations]
recipe = slapos.cookbook:publish
......@@ -47,4 +47,4 @@ 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 =
maarch-sql-data-file =
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