]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
http: new function to merge config sets
authorPetr Špaček <petr.spacek@nic.cz>
Mon, 15 Apr 2019 13:40:27 +0000 (15:40 +0200)
committerPetr Špaček <petr.spacek@nic.cz>
Thu, 18 Apr 2019 08:08:15 +0000 (10:08 +0200)
modules/http/http.lua.in

index 7bdadb13f44a0408472a0dc39b0128820f2696ec..5db6721b90fefbc3e8613a9235ec55563929bb4c 100644 (file)
@@ -279,6 +279,18 @@ local function updatecert(crtfile, keyfile)
        return crt, key
 end
 
+-- @function Merge dictionaries.
+-- Values from right-hand side dictionaries take precedence.
+function M.mergeconf(...)
+       local merged = {}
+       for _, intable in ipairs({...}) do
+               for key, val in pairs(intable) do
+                       merged[key] = val
+               end
+       end
+       return merged
+end
+
 -- @function Listen on given HTTP(s) host
 function M.add_interface(conf)
        local crt, key, ephemeral