Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos
Commits
e04b088d
Commit
e04b088d
authored
Apr 02, 2012
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ~ to concatenate strings.
parent
f8dabe4d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
software/erp5/instance-tidstorage.cfg.in
software/erp5/instance-tidstorage.cfg.in
+4
-4
software/erp5/software.cfg
software/erp5/software.cfg
+1
-1
No files found.
software/erp5/instance-tidstorage.cfg.in
View file @
e04b088d
...
...
@@ -86,12 +86,12 @@ bt5-repository-list =
promise-path = ${erp5-promise:promise-path}
site-id = {{ site_id }}
[{{ section('logrotate-entry-'
+
name) }}]
[{{ section('logrotate-entry-'
~
name) }}]
< = logrotate-base
recipe = slapos.cookbook:logrotate.d
name = {{ name }}
log = {{ '${'
+ name + ':event-log}' }} {{ '${' + name +
':z2-log}' }}
post = {{ bin_directory }}/killpidfromfile {{ '${'
+ name +
':pid-file}' }} SIGUSR2
log = {{ '${'
~ name ~ ':event-log}' }} {{ '${' ~ name ~
':z2-log}' }}
post = {{ bin_directory }}/killpidfromfile {{ '${'
~ name ~
':pid-file}' }} SIGUSR2
{% endmacro -%}
#############################
# Directory creation
...
...
@@ -301,7 +301,7 @@ binary-path = {{ bin_directory }}/runzeo
'storage-name': zeo_slave['storage-name'],
'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 known_tid_storage_identifier_dict.__setitem__("((('%(ip)s', %(port)s),), '%(storage_name)s')" % {
'ip': '${zeo-instance-%s:ip}' % zeo_id,
...
...
software/erp5/software.cfg
View file @
e04b088d
...
...
@@ -127,7 +127,7 @@ extra-context =
[template-tidstorage]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-tidstorage.cfg.in
md5sum =
475c4cc741987afcace7f0db71b7cc41
md5sum =
0f2acaf5c834ad5be6ce19dfd9305d50
mode = 640
[template-cloudooo]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment