From 5307ec6040255dbe526f1386df3128f480f02189 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Tue, 10 Jul 2018 20:30:56 +0200
Subject: [PATCH] NEO: add 'mysql' and 'neolog' to instance bin directory
---
software/neoppod/instance-neo-storage-mysql.cfg.in | 11 +++++++++++
software/neoppod/software-common.cfg | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/software/neoppod/instance-neo-storage-mysql.cfg.in b/software/neoppod/instance-neo-storage-mysql.cfg.in
index ea9878050..12b0f4537 100644
--- a/software/neoppod/instance-neo-storage-mysql.cfg.in
+++ b/software/neoppod/instance-neo-storage-mysql.cfg.in
@@ -28,6 +28,17 @@ rendered = ${directory:etc}/mariadb.cnf
template = {{ template_neo_my_cnf }}
context = section parameter_dict my-cnf-parameters
+[{{ section('binary-wrap-mysql') }}]
+recipe = slapos.cookbook:wrapper
+command-line = ${mysqld:mysql-base-directory}/bin/${:command} --defaults-file=${my-cnf:rendered}
+wrapper-path = ${directory:bin}/${:command}
+command = mysql
+
+[{{ section('binary-neolog') }}]
+recipe = slapos.cookbook:symbolic.link
+target-directory = ${directory:bin}
+link-binary = {{ bin_directory }}/neolog
+
{% set master_list = [] -%}
{% set admin_list = [] -%}
{% for k, v in slapparameter_dict.iteritems() -%}
diff --git a/software/neoppod/software-common.cfg b/software/neoppod/software-common.cfg
index 3fbbcaa0d..8181707fc 100644
--- a/software/neoppod/software-common.cfg
+++ b/software/neoppod/software-common.cfg
@@ -105,7 +105,7 @@ md5sum = 1fee10f02c2fa2a581e21878ca0fd704
[instance-neo-storage-mysql]
<= download-base-neo
-md5sum = 9ca3283659f98713ffe3b08ba9442ff1
+md5sum = 16024af1cde9c0fcc7e8e05ec0854b30
[template-neo-my-cnf]
<= download-base-neo
--
2.30.9