Commit e04b088d authored by Vincent Pelletier's avatar Vincent Pelletier

Use ~ to concatenate strings.

parent f8dabe4d
...@@ -86,12 +86,12 @@ bt5-repository-list = ...@@ -86,12 +86,12 @@ bt5-repository-list =
promise-path = ${erp5-promise:promise-path} promise-path = ${erp5-promise:promise-path}
site-id = {{ site_id }} site-id = {{ site_id }}
[{{ section('logrotate-entry-' + name) }}] [{{ section('logrotate-entry-' ~ name) }}]
< = logrotate-base < = logrotate-base
recipe = slapos.cookbook:logrotate.d recipe = slapos.cookbook:logrotate.d
name = {{ name }} name = {{ name }}
log = {{ '${' + name + ':event-log}' }} {{ '${' + name + ':z2-log}' }} log = {{ '${' ~ name ~ ':event-log}' }} {{ '${' ~ name ~ ':z2-log}' }}
post = {{ bin_directory }}/killpidfromfile {{ '${' + name + ':pid-file}' }} SIGUSR2 post = {{ bin_directory }}/killpidfromfile {{ '${' ~ name ~ ':pid-file}' }} SIGUSR2
{% endmacro -%} {% endmacro -%}
############################# #############################
# Directory creation # Directory creation
...@@ -301,7 +301,7 @@ binary-path = {{ bin_directory }}/runzeo ...@@ -301,7 +301,7 @@ binary-path = {{ bin_directory }}/runzeo
'storage-name': zeo_slave['storage-name'], 'storage-name': zeo_slave['storage-name'],
'server': '${zeo-instance-%(zeo-id)s:ip}:${zeo-instance-%(zeo-id)s:port}' % {'zeo-id': zeo_id}, 'server': '${zeo-instance-%(zeo-id)s:ip}:${zeo-instance-%(zeo-id)s:port}' % {'zeo-id': zeo_id},
}) -%} }) -%}
{% set zodb_path = '${directory:zodb}/' + zeo_slave['storage-name'] + '.fs' -%} {% set zodb_path = '${directory:zodb}/' ~ zeo_slave['storage-name'] ~ '.fs' -%}
{% do storage_list.append('storage-name=%(storage-name)s zodb-path=%(zodb-path)s' % {'zodb-path': zodb_path, 'storage-name': zeo_slave['storage-name']}) -%} {% do storage_list.append('storage-name=%(storage-name)s zodb-path=%(zodb-path)s' % {'zodb-path': zodb_path, 'storage-name': zeo_slave['storage-name']}) -%}
{% do known_tid_storage_identifier_dict.__setitem__("((('%(ip)s', %(port)s),), '%(storage_name)s')" % { {% do known_tid_storage_identifier_dict.__setitem__("((('%(ip)s', %(port)s),), '%(storage_name)s')" % {
'ip': '${zeo-instance-%s:ip}' % zeo_id, 'ip': '${zeo-instance-%s:ip}' % zeo_id,
......
...@@ -127,7 +127,7 @@ extra-context = ...@@ -127,7 +127,7 @@ extra-context =
[template-tidstorage] [template-tidstorage]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum = 475c4cc741987afcace7f0db71b7cc41 md5sum = 0f2acaf5c834ad5be6ce19dfd9305d50
mode = 640 mode = 640
[template-cloudooo] [template-cloudooo]
......
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