Commit d704c4f0 authored by Jérome Perrin's avatar Jérome Perrin

software/erp5testnode: restart on config change

parent eb7a74b7
...@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e ...@@ -18,4 +18,4 @@ md5sum = 307663d73ef3ef94b02567ecd322252e
[template-default] [template-default]
filename = instance-default.cfg filename = instance-default.cfg
md5sum = 3c2420de64f079b3b3231dfbff1633b5 md5sum = 2cf79fccd2e2a01c7526c7ac1b5dbaa8
...@@ -18,7 +18,7 @@ parts = ...@@ -18,7 +18,7 @@ parts =
resiliency-exclude-file resiliency-exclude-file
shellinabox-frontend-reload shellinabox-frontend-reload
promises promises
[monitor-publish] [monitor-publish]
recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
url = $${shellinabox-frontend:url} url = $${shellinabox-frontend:url}
...@@ -28,7 +28,7 @@ frontend-url = $${testnode-frontend:connection-secure_access} ...@@ -28,7 +28,7 @@ frontend-url = $${testnode-frontend:connection-secure_access}
recipe = slapos.cookbook:generate.password recipe = slapos.cookbook:generate.password
storage-path = $${buildout:directory}/.password storage-path = $${buildout:directory}/.password
[testnode] [testnode-bin]
recipe = slapos.cookbook:erp5testnode recipe = slapos.cookbook:erp5testnode
slapos-directory = $${directory:slapos} slapos-directory = $${directory:slapos}
working-directory = $${directory:testnode} working-directory = $${directory:testnode}
...@@ -65,7 +65,7 @@ httpd-key-file = $${rootdirectory:etc}/httpd-private.key ...@@ -65,7 +65,7 @@ httpd-key-file = $${rootdirectory:etc}/httpd-private.key
configuration-file = $${rootdirectory:etc}/erp5testnode.cfg configuration-file = $${rootdirectory:etc}/erp5testnode.cfg
log-file = $${basedirectory:log}/erp5testnode.log log-file = $${basedirectory:log}/erp5testnode.log
wrapper = $${basedirectory:services}/erp5testnode wrapper = $${buildout:bin-directory}/erp5testnode-service
# Binaries # Binaries
apache-binary = ${apache:location}/bin/httpd apache-binary = ${apache:location}/bin/httpd
...@@ -73,6 +73,14 @@ apache-modules-dir = ${apache:location}/modules ...@@ -73,6 +73,14 @@ apache-modules-dir = ${apache:location}/modules
apache-mime-file = ${apache:location}/conf/mime.types apache-mime-file = ${apache:location}/conf/mime.types
apache-htpasswd = ${apache:location}/bin/htpasswd apache-htpasswd = ${apache:location}/bin/htpasswd
[testnode]
# wrapper over erp5testnode which restarts the service when configuration changed
recipe = slapos.cookbook:wrapper
wrapper-path = $${basedirectory:services}/erp5testnode
command-line = $${testnode-bin:wrapper}
hash-existing-files =
$${testnode-bin:wrapper}
$${testnode-bin:configuration-file}
[shell-environment] [shell-environment]
shell = ${bash:location}/bin/bash shell = ${bash:location}/bin/bash
...@@ -129,7 +137,7 @@ pidfile = $${basedirectory:run}/$${:_buildout_section_name_}.pid ...@@ -129,7 +137,7 @@ pidfile = $${basedirectory:run}/$${:_buildout_section_name_}.pid
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
wrapper-path = $${basedirectory:services}/$${:_buildout_section_name_} wrapper-path = $${basedirectory:services}/$${:_buildout_section_name_}
command-line = command-line =
${bash:location}/bin/bash -c ${bash:location}/bin/bash -c
"kill -s USR1 $$(${coreutils:location}/bin/cat $${shellinabox-frontend:pidfile}) \ "kill -s USR1 $$(${coreutils:location}/bin/cat $${shellinabox-frontend:pidfile}) \
&& ${coreutils:location}/bin/sleep infinity" && ${coreutils:location}/bin/sleep infinity"
hash-files = hash-files =
......
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