From 0723d4c4db0a6da4ae7d28b58e3db52ee9f4c111 Mon Sep 17 00:00:00 2001
From: Valentin Goncharov <gvg14u147@gmail.com>
Date: Mon, 12 Feb 2024 16:37:10 +0300
Subject: [PATCH 1/2] Override tarantool embedded config module

---
 rockspecs/config-scm-6.rockspec | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 rockspecs/config-scm-6.rockspec

diff --git a/rockspecs/config-scm-6.rockspec b/rockspecs/config-scm-6.rockspec
new file mode 100644
index 0000000..7b7546e
--- /dev/null
+++ b/rockspecs/config-scm-6.rockspec
@@ -0,0 +1,23 @@
+package = 'config'
+version = 'scm-6'
+source  = {
+    url    = 'git+https://github.com/moonlibs/config.git',
+    branch = 'master',
+}
+description = {
+    summary  = "Package for loading external lua config",
+    homepage = 'https://github.com/moonlibs/config.git',
+    license  = 'BSD',
+}
+dependencies = {
+    'lua >= 5.1'
+}
+build = {
+    type = 'builtin',
+    modules = {
+        ['override.config'] = 'config.lua';
+        ['override.config.etcd'] = 'config/etcd.lua';
+    }
+}
+
+-- vim: syntax=lua

From 951f6b185d2f4131f066ee499ab151576bc5e41e Mon Sep 17 00:00:00 2001
From: Valentin Goncharov <gvg14u147@gmail.com>
Date: Mon, 12 Feb 2024 16:37:49 +0300
Subject: [PATCH 2/2] Fix dropping non-boxcfg options

---
 config.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.lua b/config.lua
index 5ffb25c..fa18aba 100644
--- a/config.lua
+++ b/config.lua
@@ -714,7 +714,7 @@ end
 
 local function do_cfg(boxcfg, cfg)
 	for key, val in pairs(cfg) do
-		if load_cfg.default_cfg[key] == nil and load_cfg.dynamic_cfg[key] == nil then
+		if load_cfg.template_cfg[key] == nil then
 			local warn = string.format("Dropping non-boxcfg option '%s' given '%s'",key,val)
 			log.warn("%s",warn)
 			print(warn)