Commit 4c153810 authored by Julien Muchembled's avatar Julien Muchembled

randomsleep: clean-up

parent aae0d49c
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
extends = extends =
../coreutils/buildout.cfg ../coreutils/buildout.cfg
../patch/buildout.cfg ../patch/buildout.cfg
../randomsleep/buildout.cfg
parts = dcron-output parts = dcron-output
...@@ -20,7 +19,6 @@ make-options = ...@@ -20,7 +19,6 @@ make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
post-install = post-install =
chmod u-s %(location)s/bin/crontab chmod u-s %(location)s/bin/crontab
dummy = ${randomsleep:recipe}
[dcron-output] [dcron-output]
# Shared binary location to ease migration # Shared binary location to ease migration
......
...@@ -4,10 +4,10 @@ extends = ...@@ -4,10 +4,10 @@ extends =
../bash/buildout.cfg ../bash/buildout.cfg
[randomsleep] [randomsleep]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template
rendered = ${buildout:bin-directory}/${:_buildout_section_name_} output = ${buildout:bin-directory}/${:_buildout_section_name_}
template = inline =
inline:#!${bash:location}/bin/bash #!${bash:location}/bin/bash
[ $# = 1 ] || { [ $# = 1 ] || {
echo "usage: ${:_buildout_section_name_} maxseconds" echo "usage: ${:_buildout_section_name_} maxseconds"
exit 1 exit 1
......
...@@ -8,6 +8,7 @@ extends = ...@@ -8,6 +8,7 @@ extends =
../../component/openssl/buildout.cfg ../../component/openssl/buildout.cfg
../../component/lxml-python/buildout.cfg ../../component/lxml-python/buildout.cfg
../../component/python-cryptography/buildout.cfg ../../component/python-cryptography/buildout.cfg
../../component/randomsleep/buildout.cfg
../../stack/logrotate/buildout.cfg ../../stack/logrotate/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
...@@ -65,6 +66,7 @@ rendered = ${buildout:directory}/template-monitor.cfg ...@@ -65,6 +66,7 @@ rendered = ${buildout:directory}/template-monitor.cfg
context = context =
key apache_location apache:location key apache_location apache:location
key template_logrotate_base template-logrotate-base:rendered key template_logrotate_base template-logrotate-base:rendered
key randomsleep randomsleep:output
raw monitor_bin ${buildout:bin-directory}/monitor.bootstrap raw monitor_bin ${buildout:bin-directory}/monitor.bootstrap
raw monitor_collect ${buildout:bin-directory}/monitor.collect raw monitor_collect ${buildout:bin-directory}/monitor.collect
raw monitor_statistic ${buildout:bin-directory}/monitor.statistic raw monitor_statistic ${buildout:bin-directory}/monitor.statistic
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[monitor2-template] [monitor2-template]
filename = instance-monitor.cfg.jinja2.in filename = instance-monitor.cfg.jinja2.in
md5sum = 3cba541a8b0b22c2648848ed1d259174 md5sum = fb10eabe010d136764365c7df2993814
[monitor-httpd-conf] [monitor-httpd-conf]
_update_hash_filename_ = templates/monitor-httpd.conf.in _update_hash_filename_ = templates/monitor-httpd.conf.in
......
...@@ -250,7 +250,7 @@ recipe = slapos.cookbook:cron.d ...@@ -250,7 +250,7 @@ recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries} cron-entries = ${cron:cron-entries}
name = monitor-globalstate name = monitor-globalstate
frequency = */2 * * * * frequency = */2 * * * *
command = {{ bin_directory }}/randomsleep 20 && ${monitor-globalstate-wrapper:wrapper-path} command = {{ randomsleep }} 20 && ${monitor-globalstate-wrapper:wrapper-path}
[monitor-globalstate-first-run] [monitor-globalstate-first-run]
recipe = plone.recipe.command recipe = plone.recipe.command
...@@ -262,14 +262,14 @@ recipe = slapos.cookbook:cron.d ...@@ -262,14 +262,14 @@ recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries} cron-entries = ${cron:cron-entries}
name = monitor-configurator name = monitor-configurator
frequency = * * * * * frequency = * * * * *
command = {{ bin_directory }}/randomsleep 10 && ${monitor-configurator-wrapper:wrapper-path} command = {{ randomsleep }} 10 && ${monitor-configurator-wrapper:wrapper-path}
[monitor-collect-cron-entry] [monitor-collect-cron-entry]
recipe = slapos.cookbook:cron.d recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries} cron-entries = ${cron:cron-entries}
name = monitor_collect name = monitor_collect
frequency = * * * * * frequency = * * * * *
command = {{ bin_directory }}/randomsleep 40 && ${monitor-collect-wrapper:wrapper-path} command = {{ randomsleep }} 40 && ${monitor-collect-wrapper:wrapper-path}
[logrotate-entry-monitor-data] [logrotate-entry-monitor-data]
recipe = collective.recipe.template recipe = collective.recipe.template
......
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