diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg index aa96a0bce1f684dd39ff173cf5f33223330bcf24..b864fe41f64872b326d59fbb9f630874b7e8c710 100644 --- a/software/slaprunner/buildout.hash.cfg +++ b/software/slaprunner/buildout.hash.cfg @@ -18,7 +18,7 @@ md5sum = ec70348dd71b319590a5c5837f3d2e45 [template-runner] filename = instance-runner.cfg -md5sum = d383fcdb832031aa4bd00bde94901819 +md5sum = dc3a7734b08977f438b35d441a12f628 [template-runner-import-script] filename = template/runner-import.sh.jinja2 diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index 7818049dbbafcf1cadf30f21245b526f0a94ddf6..6be257ce83a42512a93ab71570722b2b885fc404 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -155,10 +155,10 @@ private-project = $${:home}/.git-private public-project = $${:home}/.git-public [slaprunner] -slaprunner = ${buildout:directory}/bin/slaprunner -slapos = ${buildout:directory}/bin/slapos -slapproxy = ${buildout:directory}/bin/slapproxy -supervisor = ${buildout:directory}/bin/slapgrid-supervisorctl +slaprunner = ${buildout:bin-directory}/slaprunner +slapos = ${buildout:bin-directory}/slapos +slapproxy = ${buildout:bin-directory}/slapproxy +supervisor = ${buildout:bin-directory}/slapgrid-supervisorctl git-binary = ${git:location}/bin/git root_check = false slapos.cfg = $${directory:etc}/slapos.cfg @@ -230,7 +230,7 @@ auto_deploy = True [runtestsuite] recipe = slapos.cookbook:wrapper arguments = --server_url=$${slap-connection:server-url} --key_file=$${slap-connection:key-file} --cert_file=$${slap-connection:cert-file} --computer_id=$${slap-connection:computer-id} --partition_id=$${slap-connection:partition-id} -command-line = ${buildout:directory}/bin/slaprunnertest $${:arguments} +command-line = ${buildout:bin-directory}/slaprunnertest $${:arguments} wrapper-path = $${directory:bin}/runTestSuite environment = PATH=$${shell-environment:path} RUNNER_CONFIG=$${slapos-cfg:rendered} @@ -418,7 +418,7 @@ hash-existing-files = $${buildout:directory}/software_release/buildout.cfg <= logrotate-entry-base name = apache log = $${directory:log}/httpd-access.log $${directory:log}/httpd-error.log -post = test ! -s $${buildout:directory}/var/run/httpd.pid || $${buildout:directory}/bin/slapos-kill --pidfile $${buildout:directory}/var/run/httpd.pid -s USR1 +post = test ! -s $${buildout:directory}/var/run/httpd.pid || ${buildout:bin-directory}/slapos-kill --pidfile $${buildout:directory}/var/run/httpd.pid -s USR1 [httpd-graceful-wrapper] recipe = collective.recipe.template @@ -448,7 +448,7 @@ stop-on-error = true #-- WSGI [gunicorn] -bin_gunicorn = $${directory:bin}/gunicorn +bin_gunicorn = ${buildout:bin-directory}/gunicorn bin_launcher = $${directory:services}/gunicorn path_shell = ${dash:location}/bin/dash socket = $${directory:tmp}/flaskserver.sock @@ -466,7 +466,7 @@ hash-existing-files = $${buildout:directory}/software_release/buildout.cfg [gunicorn-graceful] recipe = slapos.cookbook:wrapper -command-line = ${buildout:directory}/bin/killpidfromfile $${gunicorn:path_pid} SIGHUP +command-line = ${buildout:bin-directory}/killpidfromfile $${gunicorn:path_pid} SIGHUP wrapper-path = $${directory:scripts}/gunicorn-graceful #-------------------- @@ -692,7 +692,7 @@ hash-existing-files = $${buildout:directory}/software_release/buildout.cfg [shell-environment] shell = ${bash:location}/bin/bash -path = ${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${tmux:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin:${tig:location}/bin:${zip:location}/bin:${mosh:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:$${buildout:directory}/bin/:/usr/bin:/bin/ +path = ${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${tmux:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin:${tig:location}/bin:${zip:location}/bin:${mosh:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:$${directory:bin}:/usr/bin:/bin/ [prepare-software] recipe = slapos.cookbook:wrapper @@ -811,11 +811,11 @@ mode = 0744 context = section supervisord supervisord section slaprunner slaprunner - raw python_executable ${buildout:directory}/bin/${extra-eggs:interpreter} + raw python_executable ${buildout:bin-directory}/${extra-eggs:interpreter} [supervisord-wrapper] recipe = slapos.cookbook:wrapper -command-line = $${buildout:directory}/bin/supervisord -c $${supervisord-conf:rendered} --nodaemon +command-line = ${buildout:bin-directory}/supervisord -c $${supervisord-conf:rendered} --nodaemon wrapper-path = $${directory:services}/supervisord hash-existing-files = $${buildout:directory}/software_release/buildout.cfg