etcd: rename module ketcd -> etcd

The old name was confusing because module name was different than all
other names and references in manual.

diff --git a/NEWS b/NEWS
index 61e59077410cb1ea39ca53d9010f90cff534243a..0855cd0130955e28084aed6db50d336345cd00e0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ Knot Resolver 2.0.0 (2018-xx-yy)
 Incompatible changes
 --------------------
 - script supervisor.py was removed, please migrate to a real process manager
+- module ketcd was renamed to etcd for consistency
 - module kmemcached was renamed to memcached for consistency
 
 Knot Resolver 1.5.1 (2017-1x-yy)

diff --git a/doc/modules.rst b/doc/modules.rst
index 2348ef39262db3556ee0c631c5e7a20bd64a1144..709fee8ed0b3edec4d3999c46c7953e95ca0cb93 100644 (file)
--- a/doc/modules.rst
+++ b/doc/modules.rst
@@ -18,7 +18,7 @@ Knot DNS Resolver modules
 .. include:: ../modules/graphite/README.rst
 .. include:: ../modules/memcached/README.rst
 .. include:: ../modules/redis/README.rst
-.. include:: ../modules/ketcd/README.rst
+.. include:: ../modules/etcd/README.rst
 .. include:: ../modules/dns64/README.rst
 .. include:: ../modules/renumber/README.rst
 .. include:: ../modules/cookies/README.rst

diff --git a/modules/ketcd/README.rst b/modules/etcd/README.rst
similarity index 98%
rename from modules/ketcd/README.rst
rename to modules/etcd/README.rst
index a3803deb3284815d1e292883d1b97b7b89e448c7..d25b369a4c3bceddd78cd211715ebb82efdd3cf0 100644 (file)
--- a/modules/ketcd/README.rst
+++ b/modules/etcd/README.rst
@@ -27,7 +27,7 @@ Example configuration
 .. code-block:: lua
 
        modules = {
-               ketcd = {
+               etcd = {
                        prefix = '/kresd',
                        peer = 'http://127.0.0.1:7001'
                }

diff --git a/modules/ketcd/ketcd.lua b/modules/etcd/etcd.lua
similarity index 58%
rename from modules/ketcd/ketcd.lua
rename to modules/etcd/etcd.lua
index 018704c6e954379147365238d2b2c792eeca64c5..08348529dac9e394d4badff2936a9dda418063c0 100644 (file)
--- a/modules/ketcd/ketcd.lua
+++ b/modules/etcd/etcd.lua
@@ -1,5 +1,5 @@
---- @module ketcd
-local ketcd = {}
+--- @module etcd
+local etcd = {}
 
 -- @function update subtree configuration
 local function update_subtree(tree)
@@ -17,39 +17,39 @@ local function update_subtree(tree)
 end
 
 -- @function reload whole configuration
-function ketcd.reload()
-       local res, err = ketcd.cli:readdir('/', true)
+function etcd.reload()
+       local res, err = etcd.cli:readdir('/', true)
        if err then
                error(err)
        end
        update_subtree(res.body.node.nodes)
 end
 
-function ketcd.init()
-       ketcd.Etcd = require('etcd.luasocket')
-       ketcd.defaults = { prefix = '/kresd' }
+function etcd.init()
+       etcd.Etcd = require('etcd.luasocket')
+       etcd.defaults = { prefix = '/kresd' }
 end
 
-function ketcd.deinit()
-       if ketcd.ev then event.cancel(ketcd.ev) end
+function etcd.deinit()
+       if etcd.ev then event.cancel(etcd.ev) end
 end
 
-function ketcd.config(conf)
-       local options = ketcd.defaults
+function etcd.config(conf)
+       local options = etcd.defaults
        if type(conf) == 'table' then
                for k,v in pairs(conf) do options[k] = v end
        end
        -- create connection
-       local cli, err = ketcd.Etcd.new(options)
+       local cli, err = etcd.Etcd.new(options)
        if err then
                error(err)
        end
-       ketcd.cli = cli
+       etcd.cli = cli
        -- schedule recurrent polling
        -- @todo: the etcd has watch() API, but this requires
        --        coroutines on socket operations
-       if ketcd.ev then event.cancel(ketcd.ev) end
-       ketcd.ev = event.recurrent(5 * sec, ketcd.reload)
+       if etcd.ev then event.cancel(etcd.ev) end
+       etcd.ev = event.recurrent(5 * sec, etcd.reload)
 end
 
-return ketcd
+return etcd

diff --git a/modules/etcd/etcd.mk b/modules/etcd/etcd.mk
new file mode 100644 (file)
index 0000000..0b8d244
--- /dev/null
+++ b/modules/etcd/etcd.mk
@@ -0,0 +1,2 @@
+etcd_SOURCES := etcd.lua
+$(call make_lua_module,etcd)

diff --git a/modules/ketcd/ketcd.mk b/modules/ketcd/ketcd.mk
deleted file mode 100644 (file)
index 8fa61d7..0000000
--- a/modules/ketcd/ketcd.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-ketcd_SOURCES := ketcd.lua
-$(call make_lua_module,ketcd)

diff --git a/modules/modules.mk b/modules/modules.mk
index 6106ac162bd2242110f02cc1624cd5386ffe455d..23d597d116d4cdb3757a85f330a17684116fdd93 100644 (file)
--- a/modules/modules.mk
+++ b/modules/modules.mk
@@ -22,7 +22,7 @@ endif
 
 # List of Lua modules
 ifeq ($(HAS_lua),yes)
-modules_TARGETS += ketcd \
+modules_TARGETS += etcd \
                    graphite \
                    policy \
                    view \