randomsleep: clean-up

component/dcron/buildout.cfg

@@ -2,7 +2,6 @@
 extends =
   ../coreutils/buildout.cfg
   ../patch/buildout.cfg
-  ../randomsleep/buildout.cfg
 
 parts = dcron-output
 
@@ -20,7 +19,6 @@ make-options =
   PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
 post-install =
   chmod u-s %(location)s/bin/crontab
-dummy = ${randomsleep:recipe}
 
 [dcron-output]
 # Shared binary location to ease migration

component/randomsleep/buildout.cfg

@@ -4,10 +4,10 @@ extends =
   ../bash/buildout.cfg
 
 [randomsleep]
-recipe = slapos.recipe.template:jinja2
-rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
-template =
-  inline:#!${bash:location}/bin/bash
+recipe = slapos.recipe.template
+output = ${buildout:bin-directory}/${:_buildout_section_name_}
+inline =
+  #!${bash:location}/bin/bash
   [ $# = 1 ] || {
     echo "usage: ${:_buildout_section_name_} maxseconds"
     exit 1

stack/monitor/buildout.cfg

@@ -8,6 +8,7 @@ extends =
   ../../component/openssl/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/python-cryptography/buildout.cfg
+  ../../component/randomsleep/buildout.cfg
   ../../stack/logrotate/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -65,6 +66,7 @@ rendered = ${buildout:directory}/template-monitor.cfg
 context =
     key apache_location apache:location
     key template_logrotate_base template-logrotate-base:rendered
+    key randomsleep randomsleep:output
     raw monitor_bin ${buildout:bin-directory}/monitor.bootstrap
     raw monitor_collect ${buildout:bin-directory}/monitor.collect
     raw monitor_statistic ${buildout:bin-directory}/monitor.statistic

stack/monitor/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [monitor2-template]
 filename = instance-monitor.cfg.jinja2.in
-md5sum = 3cba541a8b0b22c2648848ed1d259174
+md5sum = fb10eabe010d136764365c7df2993814
 
 [monitor-httpd-conf]
 _update_hash_filename_ = templates/monitor-httpd.conf.in

stack/monitor/instance-monitor.cfg.jinja2.in

@@ -250,7 +250,7 @@ recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
 name = monitor-globalstate
 frequency = */2 * * * *
-command = {{ bin_directory }}/randomsleep 20 && ${monitor-globalstate-wrapper:wrapper-path}
+command = {{ randomsleep }} 20 && ${monitor-globalstate-wrapper:wrapper-path}
 
 [monitor-globalstate-first-run]
 recipe = plone.recipe.command
@@ -262,14 +262,14 @@ recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
 name = monitor-configurator
 frequency = * * * * *
-command = {{ bin_directory }}/randomsleep 10 && ${monitor-configurator-wrapper:wrapper-path}
+command = {{ randomsleep }} 10 && ${monitor-configurator-wrapper:wrapper-path}
 
 [monitor-collect-cron-entry]
 recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}
 name = monitor_collect
 frequency = * * * * *
-command = {{ bin_directory }}/randomsleep 40 && ${monitor-collect-wrapper:wrapper-path}
+command = {{ randomsleep }} 40 && ${monitor-collect-wrapper:wrapper-path}
 
 [logrotate-entry-monitor-data]
 recipe = collective.recipe.template