diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg index b5506f98288b52234db7ad5e94c6e2b67ef2c1aa..996210624695fc4881c8ca3b258c0cf7e020c463 100644 --- a/stack/erp5/buildout.cfg +++ b/stack/erp5/buildout.cfg @@ -305,7 +305,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d [template-zeo] < = download-base filename = instance-zeo.cfg.in -md5sum = 6b99d2712aff3a8a717400a557dc5191 +md5sum = 7bbb690cb2ea38cd2aa84c8a79c50399 [template-zope] < = download-base diff --git a/stack/erp5/instance-zeo.cfg.in b/stack/erp5/instance-zeo.cfg.in index eb227e6bc9220a04c6d49afd34364f82dfef605d..c1fd87b500bac6548571634baccef0dbf4f3cfd0 100644 --- a/stack/erp5/instance-zeo.cfg.in +++ b/stack/erp5/instance-zeo.cfg.in @@ -178,7 +178,12 @@ recipe = slapos.cookbook:cron.d cron-entries = ${cron:cron-entries} name = purge-repozo-fsindex time = ${cron-entry-tidstorage-backup:time} -command = {{ parameter_dict['findutils-location'] }}/bin/find {% for backup_directory in backup_directory_list %}'{{ backup_directory.replace("\\", "\\\\").replace("'", "\\'") }}' {% endfor %}-name "????-??-??-??-??-??.index" -daystart -mtime +2 -delete +command = ${cron-script-purge-repozo-fsindex:wrapper-path} + +[cron-script-purge-repozo-fsindex] +recipe = slapos.cookbook:wrapper +command-line = "{{ parameter_dict['findutils-location'] }}/bin/find" {% for backup_directory in backup_directory_list %}'{{ backup_directory.replace("\\", "\\\\").replace("'", "\\'") }}' {% endfor %}-name "????-??-??-??-??-??.index" -daystart -mtime +2 -delete +wrapper-path = ${directory:bin}/cron-purge-repozo-fsindex {% endif -%} [{{ section("logrotate-tidstorage") }}] @@ -210,6 +215,7 @@ tidstorage-port = ${tidstorage:port} [directory] recipe = slapos.cookbook:mkdirectory +bin = ${buildout:directory}/bin etc = ${buildout:directory}/etc services = ${:etc}/run promises = ${:etc}/promise