Commit 13f42e86 authored by Łukasz Nowak's avatar Łukasz Nowak

Workaround buildou <= issue.

It seems that <= works only for one section (parameters from deeper sections)
are not available on top one.
parent af26819c
......@@ -27,12 +27,7 @@ wrapper = $${basedirectory:services}/apache-%(backend_name)s
recipe = slapos.cookbook:logrotate.d
name = zope
log = $${apache-%(backend_name)s:error-log} $${apache-%(backend_name)s:access-log}
frequency = daily
rotate-num = 30
post = ${buildout:bin-directory}/killpidfromfile $${apache-%(backend_name)s:pid-file} SIGUSR1
sharedscripts = true
notifempty = true
create = true
[haproxy-%(backend_name)s]
recipe = slapos.cookbook:haproxy
......
......@@ -66,6 +66,11 @@ conf = $${rootdirectory:etc}/logrotate.conf
logrotate-entries = $${directory:logrotate-entries}
backup = $${directory:logrotate-backup}
state-file = $${rootdirectory:srv}/logrotate.status
frequency = daily
rotate-num = 3650
sharedscripts = true
notifempty = true
create = true
[zeo-instance-entry-common]
recipe = slapos.cookbook:zeo
......@@ -73,15 +78,6 @@ zodb-path = $${directory:zodb}
ip = $${slap-network-information:local-ipv4}
binary-path = ${buildout:bin-directory}/runzeo
[logrotate-entry-common]
<= logrotate
recipe = slapos.cookbook:logrotate.d
frequency = daily
rotate-num = 3650
sharedscripts = true
notifempty = true
create = true
[certificate-authority]
recipe = slapos.cookbook:certificate_authority
openssl-binary = ${openssl:location}/bin/openssl
......
......@@ -9,7 +9,8 @@ storage =
wrapper-path = $${basedirectory:services}/zeo-%(zeo_id)s
[logrotate-entry-zeo-%(zeo_id)s]
<= logrotate-entry-common
<= logrotate
recipe = slapos.cookbook:logrotate.d
name = zeo-%(zeo_id)s
log = $${zeo-instance-%(zeo_id)s:log-path}
post = ${buildout:bin-directory}/killpidfromfile $${zeo-instance-%(zeo_id)s:pid-path} SIGUSR2
......@@ -39,9 +39,4 @@ runzope-binary = ${buildout:bin-directory}/runzope
recipe = slapos.cookbook:logrotate.d
name = zope
log = $${%(zope_id)s:event-log} $${%(zope_id)ss:z2-log}
frequency = daily
rotate-num = 30
post = ${buildout:bin-directory}/killpidfromfile $${%(zope_id)s:pid-file} SIGUSR2
sharedscripts = true
notifempty = true
create = true
......@@ -81,28 +81,28 @@ mode = 0644
[template-snippet-zeo]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-zeo.cfg
md5sum = 5295ea5ceedf861286bab16fc546a9c6
md5sum = ca9ee3825ff90c5c894ff1da8c601552
output = ${buildout:directory}/template-snippet-zeo.cfg
mode = 0644
[template-snippet-master]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-master.cfg
md5sum = d15f78eb8c1a04e01b3437a241b345c0
md5sum = c14f7eecea2603f53f1dd6e640ee671b
output = ${buildout:directory}/template-snippet-master.cfg
mode = 0644
[template-snippet-zope]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-zope.cfg
md5sum = db7a9fa737644f3fafa5fe3dbd855b4a
md5sum = 7ba22f125ffe67a3134631aef71a74f4
output = ${buildout:directory}/template-snippet-zope.cfg
mode = 0644
[template-snippet-backend]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/snippet-backend.cfg
md5sum = 2e3b983a3bd5029411a7d2d08b6796d7
md5sum = d6a072091666649d48c1766f2513ad1a
output = ${buildout:directory}/template-snippet-backend.cfg
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