Commit 54ecc12d authored by Marco Mariani's avatar Marco Mariani Committed by Kazuhiko Shiozaki

replaced _ with - in parameter names

parent f43144ed
...@@ -3,21 +3,21 @@ ...@@ -3,21 +3,21 @@
[maarch-configuration] [maarch-configuration]
recipe = slapos.recipe.maarch:default recipe = slapos.recipe.maarch:default
htdocs = $${apache-php:htdocs} htdocs = $${apache-php:htdocs}
db_host = $${postgres-urlparse:host} db-host = $${postgres-urlparse:host}
db_port = $${postgres-urlparse:port} db-port = $${postgres-urlparse:port}
db_dbname = $${postgres-urlparse:path} db-dbname = $${postgres-urlparse:path}
db_username = $${postgres-urlparse:username} db-username = $${postgres-urlparse:username}
db_password = $${postgres-urlparse:password} db-password = $${postgres-urlparse:password}
language = en language = en
php_ini = $${directory:php-ini-dir}/php.ini php-ini = $${directory:php-ini-dir}/php.ini
root_docservers = $${buildout:directory}/srv/docservers root-docservers = $${buildout:directory}/srv/docservers
dependency = $${apache-php:recipe} dependency = $${apache-php:recipe}
sql-data-file = $${slap-parameter:sql-data-file} sql-data-file = $${slap-parameter:sql-data-file}
[publish-connection-informations] [publish-connection-informations]
# XXX login should not be hardcoded # XXX login should not be hardcoded
login = superadmin login = superadmin
password = $${maarch-configuration:db_password} password = $${maarch-configuration:db-password}
[slap-parameter] [slap-parameter]
sql-data-file = sql-data-file =
......
...@@ -63,7 +63,7 @@ part-list = maarch-configuration ...@@ -63,7 +63,7 @@ part-list = maarch-configuration
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-custom.cfg.in url = ${:_profile_base_location_}/instance-custom.cfg.in
output = ${buildout:directory}/instance-custom.cfg output = ${buildout:directory}/instance-custom.cfg
md5sum = 2b5888a29f3bfccb76c192e4a9f17c5b md5sum = 6d73f8a9d47abe3146adadcab4f0bfb0
mode = 0644 mode = 0644
......
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