Commit 430b9dca authored by Nicolas Wavrant's avatar Nicolas Wavrant

slaprunner: deploys new file to know current working dir in minishell

parent 0c6eb22a
...@@ -44,7 +44,7 @@ mode = 0644 ...@@ -44,7 +44,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner.cfg url = ${:_profile_base_location_}/instance-runner.cfg
output = ${buildout:directory}/template-runner.cfg.in output = ${buildout:directory}/template-runner.cfg.in
md5sum = fe400e3c3bdfcf967bbf3a8574c40d4f md5sum = 0a2635984e081757dc454c20b33a9ab9
mode = 0644 mode = 0644
[template-runner-import-script] [template-runner-import-script]
...@@ -74,7 +74,7 @@ mode = 0644 ...@@ -74,7 +74,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner-export.cfg.in url = ${:_profile_base_location_}/instance-runner-export.cfg.in
output = ${buildout:directory}/instance-runner-export.cfg output = ${buildout:directory}/instance-runner-export.cfg
md5sum = 6be4dbdffd6c081860984c1a67d2fb41 md5sum = 6930a0d6c88896c43a8e60509ba6bd1c
mode = 0644 mode = 0644
[template-resilient] [template-resilient]
...@@ -119,7 +119,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -119,7 +119,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[slapos-cfg-template] [slapos-cfg-template]
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename} url = ${:_profile_base_location_}/template/${:filename}
md5sum = 788795524769f6d946526ac282508b69 md5sum = 0538b426429e26acc6ed731ecbdfc3ed
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = slapos.cfg.in filename = slapos.cfg.in
download-only = true download-only = true
......
...@@ -26,6 +26,7 @@ parts += ...@@ -26,6 +26,7 @@ parts +=
cron-entry-backup cron-entry-backup
cron-entry-prepare-software cron-entry-prepare-software
deploy-instance-parameters deploy-instance-parameters
minishell-cwd
## Monitoring part ## Monitoring part
###Parts to add for monitoring ###Parts to add for monitoring
cron cron
......
...@@ -23,6 +23,7 @@ parts = ...@@ -23,6 +23,7 @@ parts =
cron-entry-prepare-software cron-entry-prepare-software
deploy-instance-parameters deploy-instance-parameters
instance-software-type instance-software-type
minishell-cwd
{% if slapparameter_dict.get('custom-frontend-backend-url') %} {% if slapparameter_dict.get('custom-frontend-backend-url') %}
custom-frontend-promise custom-frontend-promise
{% endif %} {% endif %}
...@@ -180,6 +181,7 @@ auto_deploy = $${slap-parameter:auto-deploy} ...@@ -180,6 +181,7 @@ auto_deploy = $${slap-parameter:auto-deploy}
auto_deploy_instance = $${slap-parameter:auto-deploy-instance} auto_deploy_instance = $${slap-parameter:auto-deploy-instance}
autorun = $${slap-parameter:autorun} autorun = $${slap-parameter:autorun}
knowledge0_file = $${buildout:directory}/$${public:filename} knowledge0_file = $${buildout:directory}/$${public:filename}
minishell_cwd_file = $${directory:etc}/.minishell-cwd
[test-runner] [test-runner]
<= slaprunner <= slaprunner
...@@ -601,6 +603,12 @@ recovery-code = $${recovery-code:passwd} ...@@ -601,6 +603,12 @@ recovery-code = $${recovery-code:passwd}
[zero-parameters] [zero-parameters]
[minishell-cwd]
recipe = plone.recipe.command
command = if [ ! -f $${slaprunner:minishell_cwd_file} ]; then echo $${runnerdirectory:home} > $${slaprunner:minishell_cwd_file}; fi
location = $${slaprunner:minishell_cwd_file}
stop-on-error = true
[monitor-current-log-access] [monitor-current-log-access]
< = monitor-directory-access < = monitor-directory-access
source = $${directory:log} source = $${directory:log}
...@@ -31,6 +31,7 @@ auto_deploy = {{ slaprunner['auto_deploy'] }} ...@@ -31,6 +31,7 @@ auto_deploy = {{ slaprunner['auto_deploy'] }}
auto_deploy_instance = {{ slaprunner['auto_deploy_instance'] }} auto_deploy_instance = {{ slaprunner['auto_deploy_instance'] }}
autorun = {{ slaprunner['autorun'] }} autorun = {{ slaprunner['autorun'] }}
knowledge0_cfg = {{ slaprunner['knowledge0_file'] }} knowledge0_cfg = {{ slaprunner['knowledge0_file'] }}
minishell-cwd-file = {{ slaprunner['minishell_cwd_file'] }}
[slapproxy] [slapproxy]
host = {{ slaprunner['ipv4'] }} host = {{ slaprunner['ipv4'] }}
......
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