diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg index 18250789597eccf341fb4dfa01409fc66fd9f80f..9d3e43bdf78f7cfd4ff95316adcd2422365ac327 100644 --- a/software/slaprunner/buildout.hash.cfg +++ b/software/slaprunner/buildout.hash.cfg @@ -19,7 +19,7 @@ md5sum = 713db528880282d568278f09458d2aab [template-runner] filename = instance-runner.cfg -md5sum = ab366caca157bfa9d61307939038dab3 +md5sum = 8b1caca52ab1307343ebada59f5a6c66 [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 e58005dcc53d4fa79f8730e6914676e186fc8f46..2ee97fe07914e793b6643956e590ed247d9c439c 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -353,7 +353,7 @@ context = [logrotate-entry-nginx] <= logrotate-entry-base name = nginx -log = $${basedirectory:log}/nginx.access.log $${basedirectory:log}/nginx.error.log +log = $${directory:log}/nginx.access.log $${directory:log}/nginx.error.log post = kill -SIGUSR1 $(cat $${buildout:directory}/var/run/nginx.pid) [httpd-parameters] @@ -399,7 +399,7 @@ wait-for-files = [logrotate-entry-apache-httpd] <= logrotate-entry-base name = apache -log = $${basedirectory:log}/httpd-access.log $${basedirectory:log}/httpd-error.log +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 [httpd-graceful-wrapper] @@ -795,7 +795,7 @@ wrapper-path = $${directory:services}/supervisord [logrotate-entry-supervisord] <= logrotate-entry-base name = supervisord -log = $${basedirectory:log}/slapproxy.log $${basedirectory:log}/supervisord.log $${basedirectory:log}/supervisord-errors.log +log = $${directory:log}/slapproxy.log $${directory:log}/supervisord.log $${directory:log}/supervisord-errors.log post = kill -SIGUSR2 $(cat $${buildout:directory}/var/run/supervisord.pid) [supervisord-promise]