diff --git a/software/erp5/instance.cfg b/software/erp5/instance.cfg index d6abd66c3bf6758e1c019e29ed7a5010fc6d213b..f25f2a512ab070afc90173b188cfef7272bbc4a6 100644 --- a/software/erp5/instance.cfg +++ b/software/erp5/instance.cfg @@ -62,9 +62,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory} offline = true [dynamic-template-tidstorage] -recipe = slapos.cookbook:generatetemplate -template = ${template-zeo:output} -dynamic = ${dynamic-zeo:output} +recipe = slapos.cookbook:generate.erp5.tidstorage # output is in parts [switch-softwaretype] @@ -78,3 +76,13 @@ zeo = ${template-zeo:output} mariadb = ${template-mariadb:output} haproxy = ${template-haproxy:output} tidstorage = $${dynamic-template-tidstorage:output} + +[slap-connection] +# part to migrate to new - separated words +computer-id = $${slap_connection:computer_id} +partition-id = $${slap_connection:partition_id} +server-url = $${slap_connection:server_url} +software-release-url = $${slap_connection:software_release_url} +key-file = $${slap_connection:key_file} +cert-file = $${slap_connection:cert_file} + diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index 8ef700af6d23202dd633561f9c2280e1eb24047a..f7d1004cd0ce2f6c94239ccec4eac0aee6cbe74b 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -69,7 +69,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = 9af12972f774622c87dc1a0e55181fc6 +md5sum = e6fda1efe48316e89299882389a44726 output = ${buildout:directory}/template.cfg mode = 0644 @@ -90,7 +90,7 @@ mode = 0644 [template-erp5-production] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-erp5-production.cfg -md5sum = aae40b189c51ade58479f15de98bdbc6 +md5sum = 25bd7e8dfa2d7588c6c2c648cd291b47 output = ${buildout:directory}/template-erp5-production.cfg mode = 0644