From c85e3b0c5a085050a82527839747bc98813f75d0 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Thu, 28 Nov 2019 20:17:31 +0100
Subject: [PATCH] fixup! NEO: only load MariaDB plugin for chosen engine

Commit d0df63cf3b8ea262d459bf3071fbe6577cc63990 broke support for SQLite.
---
 software/neoppod/buildout.hash.cfg   | 2 +-
 software/neoppod/instance-neo.cfg.in | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/software/neoppod/buildout.hash.cfg b/software/neoppod/buildout.hash.cfg
index a1e5db9f2..4645dfbba 100644
--- a/software/neoppod/buildout.hash.cfg
+++ b/software/neoppod/buildout.hash.cfg
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 filename = instance-neo.cfg.in
-md5sum = d18e049d580720e733502b774b0d6790
+md5sum = 574acb0cae9af8ec2af52825fb2436d8
 
 [template-neo-my-cnf]
 filename = my.cnf.in
diff --git a/software/neoppod/instance-neo.cfg.in b/software/neoppod/instance-neo.cfg.in
index 64c1eea64..9717ca8bf 100644
--- a/software/neoppod/instance-neo.cfg.in
+++ b/software/neoppod/instance-neo.cfg.in
@@ -90,7 +90,9 @@ cluster = {{ dumps(slapparameter_dict['cluster']) }}
 masters = {{ dumps(slapparameter_dict['masters']) }}
 database-adapter = {{ storage_type }}
 wait-database = -1
+{%- if mysql %}
 engine = ${my-cnf-parameters:engine}
+{%- endif %}
 dedup = {{ dumps(bool(slapparameter_dict.get('data-deduplication'))) }}
 disable-drop-partitions = {{ dumps(bool(slapparameter_dict.get('disable-drop-partitions'))) }}
 
-- 
2.30.9