From a5dc903a9b026d6bca7e27e3cfe73c031eddae2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Fri, 14 Feb 2020 11:01:51 +0100
Subject: [PATCH] monitor: Wrap surykatka binary to avoid long #! path
In order to avoid the very long #!/.../python path, call surykatka with
explicit interpreter.
---
software/monitor/buildout.hash.cfg | 2 +-
software/monitor/instance.cfg | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/software/monitor/buildout.hash.cfg b/software/monitor/buildout.hash.cfg
index f32313d30..a0167666a 100644
--- a/software/monitor/buildout.hash.cfg
+++ b/software/monitor/buildout.hash.cfg
@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
-md5sum = 07ef40555dc76f87ecd345b99ac65c4b
+md5sum = dc9770bacea2c504b92ad2162e58d222
[template-monitor]
_update_hash_filename_ = instance-monitor.cfg.jinja2
diff --git a/software/monitor/instance.cfg b/software/monitor/instance.cfg
index 4dd434d2c..a11a2bb74 100644
--- a/software/monitor/instance.cfg
+++ b/software/monitor/instance.cfg
@@ -44,6 +44,11 @@ context = import json_module json
raw template_json_edgetest_test ${json-test-template:target}
mode = 0644
+[surykatka-wrapped]
+recipe = slapos.cookbook:wrapper
+wrapper-path = $${buildout:bin-directory}/surykatka-wrapped
+command-line = ${surykatka:location}/bin/python3.7 ${surykatka:executable}
+
[instance-base-edgebot]
recipe = slapos.recipe.template:jinja2
template = ${template-monitor-edgebot:target}
@@ -59,7 +64,7 @@ context = import json_module json
key slapparameter_dict slap-configuration:configuration
key slap_software_type slap-configuration:slap-software-type
raw software_type edgebot
- key surykatka_binary :surykatka-binary
+ key surykatka_binary surykatka-wrapped:wrapper-path
key template_surykatka_ini :template-surykatka-ini
raw buildout_bin ${buildout:bin-directory}
raw monitor_template_output ${monitor-template:output}
--
2.30.9