memcached: rename module kmemcached -> memcached

The old name was confusing because module name backend name provided by
that modules were different.

diff --git a/NEWS b/NEWS
index 19237507aaf6a8f4896b2f9182cea1bbf88be059..61e59077410cb1ea39ca53d9010f90cff534243a 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 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 d3c5eec1c63d727b788b9fe111a3e89af106fac5..2348ef39262db3556ee0c631c5e7a20bd64a1144 100644 (file)
--- a/doc/modules.rst
+++ b/doc/modules.rst
@@ -16,7 +16,7 @@ Knot DNS Resolver modules
 .. include:: ../modules/http/README.rst
 .. include:: ../modules/daf/README.rst
 .. include:: ../modules/graphite/README.rst
-.. include:: ../modules/kmemcached/README.rst
+.. include:: ../modules/memcached/README.rst
 .. include:: ../modules/redis/README.rst
 .. include:: ../modules/ketcd/README.rst
 .. include:: ../modules/dns64/README.rst

diff --git a/modules/kmemcached/kmemcached.mk b/modules/kmemcached/kmemcached.mk
deleted file mode 100644 (file)
index 24c0ac6..0000000
--- a/modules/kmemcached/kmemcached.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-kmemcached_CFLAGS := -fvisibility=hidden -fPIC
-kmemcached_SOURCES := modules/kmemcached/kmemcached.c modules/kmemcached/cdb_memcached.c
-kmemcached_DEPEND := $(libkres)
-kmemcached_LIBS := $(libkres_TARGET) $(libkres_LIBS) $(libmemcached_LIBS)
-$(call make_c_module,kmemcached)

diff --git a/modules/kmemcached/README.rst b/modules/memcached/README.rst
similarity index 98%
rename from modules/kmemcached/README.rst
rename to modules/memcached/README.rst
index dd0b1102f03d1cf9f5caed6e2ac51ad07df3e1ca..331c126bb9e031aa737dab730460eaff453b1f2d 100644 (file)
--- a/modules/kmemcached/README.rst
+++ b/modules/memcached/README.rst
@@ -8,7 +8,7 @@ After loading you can see the storage backend registered and useable.
 
 .. code-block:: lua
 
-       > modules.load 'kmemcached'
+       > modules.load 'memcached'
        > cache.backends()
        [memcached://] => true
 

diff --git a/modules/kmemcached/cdb_memcached.c b/modules/memcached/cdb_memcached.c
similarity index 100%
rename from modules/kmemcached/cdb_memcached.c
rename to modules/memcached/cdb_memcached.c

diff --git a/modules/kmemcached/kmemcached.c b/modules/memcached/memcached.c
similarity index 100%
rename from modules/kmemcached/kmemcached.c
rename to modules/memcached/memcached.c

diff --git a/modules/memcached/memcached.mk b/modules/memcached/memcached.mk
new file mode 100644 (file)
index 0000000..2eaa57c
--- /dev/null
+++ b/modules/memcached/memcached.mk
@@ -0,0 +1,5 @@
+memcached_CFLAGS := -fvisibility=hidden -fPIC
+memcached_SOURCES := modules/memcached/memcached.c modules/memcached/cdb_memcached.c
+memcached_DEPEND := $(libkres)
+memcached_LIBS := $(libkres_TARGET) $(libkres_LIBS) $(libmemcached_LIBS)
+$(call make_c_module,memcached)

diff --git a/modules/modules.mk b/modules/modules.mk
index 6734b6c3fd0e7184628f2796d5054e13775da37e..6106ac162bd2242110f02cc1624cd5386ffe455d 100644 (file)
--- a/modules/modules.mk
+++ b/modules/modules.mk
@@ -13,7 +13,7 @@ endif
 
 # Memcached
 ifeq ($(HAS_libmemcached),yes)
-modules_TARGETS += kmemcached
+modules_TARGETS += memcached
 endif
 # Redis
 ifeq ($(HAS_hiredis),yes)