diff --git a/keydb.conf b/keydb.conf index 48c321fdc..3874c5acd 100644 --- a/keydb.conf +++ b/keydb.conf @@ -3,7 +3,7 @@ # Note that in order to read the configuration file, KeyDB must be # started with the file path as first argument: # -# ./keydb-pro-server /path/to/keydb.conf +# ./keydb-server /path/to/keydb.conf # Note on units: when memory size is needed, it is possible to specify # it in the usual form of 1k 5GB 4M and so forth: diff --git a/pkg/deb/deb-buildsource.sh b/pkg/deb/deb-buildsource.sh index d51c179fb..ed055a7b6 100755 --- a/pkg/deb/deb-buildsource.sh +++ b/pkg/deb/deb-buildsource.sh @@ -19,11 +19,11 @@ elif [ "$distributor" == "Ubuntu" ]; then fi codename=$(lsb_release --codename --short) date=$(date +%a," "%d" "%b" "%Y" "%T) -pkg_name=keydb-pro-$majorv:$version$distname +pkg_name=keydb-enterprise-$majorv:$version$distname # create build tree cd ../../../ -tar -czvf keydb-pro_$version.orig.tar.gz --force-local KeyDB-Pro +tar -czvf keydb-enterprise_$version.orig.tar.gz --force-local KeyDB-Pro cd KeyDB-Pro/pkg/deb/ mkdir -p $pkg_name/tmp if [[ "$codename" == "xenial" ]] || [[ "$codename" == "stretch" ]]; then @@ -32,9 +32,9 @@ else cp -r debian $pkg_name/tmp fi cp master_changelog $pkg_name/tmp/debian/changelog -mv ../../../keydb-pro_$version.orig.tar.gz ./$pkg_name +mv ../../../keydb-enterprise_$version.orig.tar.gz ./$pkg_name cd $pkg_name/tmp -changelog_str="keydb-pro ($majorv:$version-$build$distname) $codename; urgency=medium\n\n * $version $changelog_comments \n\n -- Ben Schermel $date +0000\n\n" +changelog_str="keydb-enterprise ($majorv:$version-$build$distname) $codename; urgency=medium\n\n * $version $changelog_comments \n\n -- Ben Schermel $date +0000\n\n" if [ $# -eq 0 ]; then sed -i "1s/^/$changelog_str\n/" debian/changelog elif [ $# -eq 1 ] && [ "$1" != "None" ]; then @@ -61,4 +61,4 @@ sudo pbuilder --build *.dsc --logfile /mnt/pbuilderlog.log cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated sudo pbuilder clean cd ../ -rm -rf $pkg_name +#rm -rf $pkg_name diff --git a/pkg/deb/debian/bin/generate-systemd-service-files b/pkg/deb/debian/bin/generate-systemd-service-files index 9ee38792e..4a3df9a12 100755 --- a/pkg/deb/debian/bin/generate-systemd-service-files +++ b/pkg/deb/debian/bin/generate-systemd-service-files @@ -25,28 +25,22 @@ do case "${BINARY}" in keydb-server) NAME="keydb" - BINARY_EXEC="keydb-server" - BINARY_NAME="keydb-pro-server" - TARGET_NAME="keydb-pro-server" ;; keydb-sentinel) NAME="sentinel" - BINARY_EXEC="keydb-sentinel" - BINARY_NAME="keydb-sentinel" - TARGET_NAME="keydb-pro-sentinel" ;; esac case "${MODE}" in default) EXTRA="Alias=${NAME}.service" - TARGET="debian/${TARGET_NAME}.${BINARY}.service" + TARGET="debian/${BINARY}.service" NAMESPACED="${NAME}" DESCRIPTION="Advanced key-value store" ;; templated) EXTRA="" - TARGET="debian/${TARGET_NAME}.${BINARY}@.service" + TARGET="debian/${BINARY}@.service" NAMESPACED="${NAME}-%i" DESCRIPTION="Advanced key-value store (%I)" ;; @@ -94,7 +88,7 @@ Documentation=https://docs.keydb.dev, man:${BINARY}(1) [Service] Type=forking -ExecStart=/usr/bin/${BINARY_NAME} /etc/keydb/${NAMESPACED}.conf +ExecStart=/usr/bin/${BINARY} /etc/keydb/${NAMESPACED}.conf ExecStop=/bin/kill -s TERM \$MAINPID PIDFile=/var/run/${NAMESPACED}/${BINARY}.pid TimeoutStopSec=0 diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control index 5a46e1848..6354eaa85 100644 --- a/pkg/deb/debian/control +++ b/pkg/deb/debian/control @@ -1,4 +1,4 @@ -Source: keydb-pro +Source: keydb-enterprise Section: database Priority: optional Maintainer: Ben Schermel @@ -7,6 +7,7 @@ Build-Depends: dpkg-dev (>= 1.17.5), systemd, procps , + pkg-config , build-essential , tcl , tcl-dev , @@ -24,14 +25,14 @@ Build-Depends: libzstd-dev Standards-Version: 4.2.1 Homepage: https://docs.keydb.dev/ -Vcs-Git: https://github.com/JohnSully/KeyDB-Pro.git -Vcs-Browser: https://github.com/JohnSully/KeyDB-Pro +Vcs-Git: https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro.git +Vcs-Browser: https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro -Package: keydb-pro +Package: keydb-enterprise Architecture: all Depends: - keydb-pro-server (<< ${binary:Version}.1~), - keydb-pro-server (>= ${binary:Version}), + keydb-enterprise-server (<< ${binary:Version}.1~), + keydb-enterprise-server (>= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface (metapackage) keydb is a key-value database in a similar vein to memcache but the dataset @@ -42,11 +43,11 @@ Description: Persistent key-value database with network interface (metapackage) . This package depends on the keydb-server package. -Package: keydb-pro-sentinel +Package: keydb-enterprise-sentinel Architecture: any Depends: lsb-base (>= 3.2-14), - keydb-pro-tools (= ${binary:Version}), + keydb-enterprise-tools (= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface (monitoring) keydb is a key-value database in a similar vein to memcache but the dataset @@ -55,11 +56,11 @@ Description: Persistent key-value database with network interface (monitoring) . This package contains the keydb Sentinel monitoring software. -Package: keydb-pro-server +Package: keydb-enterprise-server Architecture: any Depends: lsb-base (>= 3.2-14), - keydb-pro-tools (= ${binary:Version}), + keydb-enterprise-tools (= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface keydb is a key-value database in a similar vein to memcache but the dataset @@ -68,7 +69,7 @@ Description: Persistent key-value database with network interface . The dataset is stored entirely in memory and periodically flushed to disk. -Package: keydb-pro-tools +Package: keydb-enterprise-tools Architecture: any Depends: adduser, diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright index c7e2428e7..57591384f 100644 --- a/pkg/deb/debian/copyright +++ b/pkg/deb/debian/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: John Sully -Upstream-Name: keydb-pro -Source: https://github.com/JohnSully/KeyDB-Pro +Upstream-Name: keydb-enterprise +Source: https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro Files: * Copyright: © 2006-2014 Salvatore Sanfilippo diff --git a/pkg/deb/debian/keydb-pro-sentinel.1 b/pkg/deb/debian/keydb-enterprise-sentinel.1 similarity index 100% rename from pkg/deb/debian/keydb-pro-sentinel.1 rename to pkg/deb/debian/keydb-enterprise-sentinel.1 diff --git a/pkg/deb/debian/keydb-pro-sentinel.install b/pkg/deb/debian/keydb-enterprise-sentinel.install similarity index 100% rename from pkg/deb/debian/keydb-pro-sentinel.install rename to pkg/deb/debian/keydb-enterprise-sentinel.install diff --git a/pkg/deb/debian/keydb-pro-sentinel.logrotate b/pkg/deb/debian/keydb-enterprise-sentinel.logrotate similarity index 100% rename from pkg/deb/debian/keydb-pro-sentinel.logrotate rename to pkg/deb/debian/keydb-enterprise-sentinel.logrotate diff --git a/pkg/deb/debian/keydb-enterprise-sentinel.manpages b/pkg/deb/debian/keydb-enterprise-sentinel.manpages new file mode 100644 index 000000000..036eda5a6 --- /dev/null +++ b/pkg/deb/debian/keydb-enterprise-sentinel.manpages @@ -0,0 +1 @@ +debian/keydb-enterprise-sentinel.1 diff --git a/pkg/deb/debian/keydb-pro-sentinel.postinst b/pkg/deb/debian/keydb-enterprise-sentinel.postinst similarity index 100% rename from pkg/deb/debian/keydb-pro-sentinel.postinst rename to pkg/deb/debian/keydb-enterprise-sentinel.postinst diff --git a/pkg/deb/debian/keydb-pro-sentinel.postrm b/pkg/deb/debian/keydb-enterprise-sentinel.postrm similarity index 100% rename from pkg/deb/debian/keydb-pro-sentinel.postrm rename to pkg/deb/debian/keydb-enterprise-sentinel.postrm diff --git a/pkg/deb/debian/keydb-pro-server.1 b/pkg/deb/debian/keydb-enterprise-server.1 similarity index 100% rename from pkg/deb/debian/keydb-pro-server.1 rename to pkg/deb/debian/keydb-enterprise-server.1 diff --git a/pkg/deb/debian/keydb-pro-server.docs b/pkg/deb/debian/keydb-enterprise-server.docs similarity index 100% rename from pkg/deb/debian/keydb-pro-server.docs rename to pkg/deb/debian/keydb-enterprise-server.docs diff --git a/pkg/deb/debian/keydb-pro-server.install b/pkg/deb/debian/keydb-enterprise-server.install similarity index 100% rename from pkg/deb/debian/keydb-pro-server.install rename to pkg/deb/debian/keydb-enterprise-server.install diff --git a/pkg/deb/debian/keydb-pro-server.logrotate b/pkg/deb/debian/keydb-enterprise-server.logrotate similarity index 100% rename from pkg/deb/debian/keydb-pro-server.logrotate rename to pkg/deb/debian/keydb-enterprise-server.logrotate diff --git a/pkg/deb/debian/keydb-enterprise-server.manpages b/pkg/deb/debian/keydb-enterprise-server.manpages new file mode 100644 index 000000000..f66cf18d1 --- /dev/null +++ b/pkg/deb/debian/keydb-enterprise-server.manpages @@ -0,0 +1 @@ +debian/keydb-enterprise-server.1 diff --git a/pkg/deb/debian/keydb-pro-server.postinst b/pkg/deb/debian/keydb-enterprise-server.postinst similarity index 100% rename from pkg/deb/debian/keydb-pro-server.postinst rename to pkg/deb/debian/keydb-enterprise-server.postinst diff --git a/pkg/deb/debian/keydb-pro-server.postrm b/pkg/deb/debian/keydb-enterprise-server.postrm similarity index 100% rename from pkg/deb/debian/keydb-pro-server.postrm rename to pkg/deb/debian/keydb-enterprise-server.postrm diff --git a/pkg/deb/debian/keydb-pro-tools.examples b/pkg/deb/debian/keydb-enterprise-tools.examples similarity index 100% rename from pkg/deb/debian/keydb-pro-tools.examples rename to pkg/deb/debian/keydb-enterprise-tools.examples diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.install b/pkg/deb/debian/keydb-enterprise-tools.install similarity index 87% rename from pkg/deb/debian_dh9/keydb-pro-tools.install rename to pkg/deb/debian/keydb-enterprise-tools.install index 346ad4597..166faeafd 100644 --- a/pkg/deb/debian_dh9/keydb-pro-tools.install +++ b/pkg/deb/debian/keydb-enterprise-tools.install @@ -3,5 +3,5 @@ src/keydb-benchmark /usr/bin src/keydb-check-aof /usr/bin src/keydb-check-rdb /usr/bin src/keydb-cli /usr/bin -src/keydb-pro-server /usr/bin +src/keydb-server /usr/bin src/keydb-sentinel /usr/bin diff --git a/pkg/deb/debian/keydb-pro-tools.manpages b/pkg/deb/debian/keydb-enterprise-tools.manpages similarity index 100% rename from pkg/deb/debian/keydb-pro-tools.manpages rename to pkg/deb/debian/keydb-enterprise-tools.manpages diff --git a/pkg/deb/debian/keydb-pro-tools.postinst b/pkg/deb/debian/keydb-enterprise-tools.postinst similarity index 100% rename from pkg/deb/debian/keydb-pro-tools.postinst rename to pkg/deb/debian/keydb-enterprise-tools.postinst diff --git a/pkg/deb/debian/keydb-pro-tools.postrm b/pkg/deb/debian/keydb-enterprise-tools.postrm similarity index 100% rename from pkg/deb/debian/keydb-pro-tools.postrm rename to pkg/deb/debian/keydb-enterprise-tools.postrm diff --git a/pkg/deb/debian/keydb-pro-sentinel.manpages b/pkg/deb/debian/keydb-pro-sentinel.manpages deleted file mode 100644 index 08ce51ff5..000000000 --- a/pkg/deb/debian/keydb-pro-sentinel.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-pro-sentinel.1 diff --git a/pkg/deb/debian/keydb-pro-server.manpages b/pkg/deb/debian/keydb-pro-server.manpages deleted file mode 100644 index 06ff67ee3..000000000 --- a/pkg/deb/debian/keydb-pro-server.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-pro-server.1 diff --git a/pkg/deb/debian/source/lintian-overrides b/pkg/deb/debian/source/lintian-overrides index 44dec9b63..ebc49b26e 100644 --- a/pkg/deb/debian/source/lintian-overrides +++ b/pkg/deb/debian/source/lintian-overrides @@ -1,2 +1,2 @@ # Upstream do not provide signed tarballs. -keydb-pro source: debian-watch-does-not-check-gpg-signature +keydb-enterprise source: debian-watch-does-not-check-gpg-signature diff --git a/pkg/deb/debian/watch b/pkg/deb/debian/watch index acca0f199..2dac38351 100644 --- a/pkg/deb/debian/watch +++ b/pkg/deb/debian/watch @@ -1,3 +1,3 @@ version=6 opts=uversionmangle=s/-?(alpha|beta|rc)/~$1/ \ - https://github.com/JohnSully/KeyDB-Pro/releases .*/archive/(.*).tar.gz + https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro/releases .*/archive/(.*).tar.gz diff --git a/pkg/deb/debian_dh9/control b/pkg/deb/debian_dh9/control index f847ad345..1932b27fe 100644 --- a/pkg/deb/debian_dh9/control +++ b/pkg/deb/debian_dh9/control @@ -1,4 +1,4 @@ -Source: keydb-pro +Source: keydb-enterprise Section: database Priority: optional Maintainer: Ben Schermel @@ -29,14 +29,14 @@ Build-Depends: libzstd-dev Standards-Version: 4.2.1 Homepage: https://docs.keydb.dev/ -Vcs-Git: https://github.com/JohnSully/KeyDB-Pro.git -Vcs-Browser: https://github.com/JohnSully/KeyDB-Pro +Vcs-Git: https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro.git +Vcs-Browser: https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro -Package: keydb-pro +Package: keydb-enterprise Architecture: all Depends: - keydb-pro-server (<< ${binary:Version}.1~), - keydb-pro-server (>= ${binary:Version}), + keydb-enterprise-server (<< ${binary:Version}.1~), + keydb-enterprise-server (>= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface (metapackage) keydb is a key-value database in a similar vein to memcache but the dataset @@ -47,11 +47,11 @@ Description: Persistent key-value database with network interface (metapackage) . This package depends on the keydb-server package. -Package: keydb-pro-sentinel +Package: keydb-enterprise-sentinel Architecture: any Depends: lsb-base (>= 3.2-14), - keydb-pro-tools (= ${binary:Version}), + keydb-enterprise-tools (= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface (monitoring) keydb is a key-value database in a similar vein to memcache but the dataset @@ -60,11 +60,11 @@ Description: Persistent key-value database with network interface (monitoring) . This package contains the keydb Sentinel monitoring software. -Package: keydb-pro-server +Package: keydb-enterprise-server Architecture: any Depends: lsb-base (>= 3.2-14), - keydb-pro-tools (= ${binary:Version}), + keydb-enterprise-tools (= ${binary:Version}), ${misc:Depends}, Description: Persistent key-value database with network interface keydb is a key-value database in a similar vein to memcache but the dataset @@ -73,7 +73,7 @@ Description: Persistent key-value database with network interface . The dataset is stored entirely in memory and periodically flushed to disk. -Package: keydb-pro-tools +Package: keydb-enterprise-tools Architecture: any Depends: adduser, diff --git a/pkg/deb/debian_dh9/copyright b/pkg/deb/debian_dh9/copyright index c7e2428e7..57591384f 100644 --- a/pkg/deb/debian_dh9/copyright +++ b/pkg/deb/debian_dh9/copyright @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: John Sully -Upstream-Name: keydb-pro -Source: https://github.com/JohnSully/KeyDB-Pro +Upstream-Name: keydb-enterprise +Source: https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro Files: * Copyright: © 2006-2014 Salvatore Sanfilippo diff --git a/pkg/deb/debian_dh9/files b/pkg/deb/debian_dh9/files deleted file mode 100644 index 4fa490963..000000000 --- a/pkg/deb/debian_dh9/files +++ /dev/null @@ -1 +0,0 @@ -keydb-pro_5.3.3-1~bionic1_source.buildinfo database optional diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.1 b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.1 similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-sentinel.1 rename to pkg/deb/debian_dh9/keydb-enterprise-sentinel.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.install b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.install similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-sentinel.install rename to pkg/deb/debian_dh9/keydb-enterprise-sentinel.install diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.logrotate b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.logrotate similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-sentinel.logrotate rename to pkg/deb/debian_dh9/keydb-enterprise-sentinel.logrotate diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.maintscript b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.maintscript similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-sentinel.maintscript rename to pkg/deb/debian_dh9/keydb-enterprise-sentinel.maintscript diff --git a/pkg/deb/debian_dh9/keydb-enterprise-sentinel.manpages b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.manpages new file mode 100644 index 000000000..036eda5a6 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.manpages @@ -0,0 +1 @@ +debian/keydb-enterprise-sentinel.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.postinst b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.postinst similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-sentinel.postinst rename to pkg/deb/debian_dh9/keydb-enterprise-sentinel.postinst diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.postrm b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.postrm similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-sentinel.postrm rename to pkg/deb/debian_dh9/keydb-enterprise-sentinel.postrm diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.prerm b/pkg/deb/debian_dh9/keydb-enterprise-sentinel.prerm similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-sentinel.prerm rename to pkg/deb/debian_dh9/keydb-enterprise-sentinel.prerm diff --git a/pkg/deb/debian_dh9/keydb-pro-server.1 b/pkg/deb/debian_dh9/keydb-enterprise-server.1 similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.1 rename to pkg/deb/debian_dh9/keydb-enterprise-server.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-server.docs b/pkg/deb/debian_dh9/keydb-enterprise-server.docs similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.docs rename to pkg/deb/debian_dh9/keydb-enterprise-server.docs diff --git a/pkg/deb/debian_dh9/keydb-pro-server.install b/pkg/deb/debian_dh9/keydb-enterprise-server.install similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.install rename to pkg/deb/debian_dh9/keydb-enterprise-server.install diff --git a/pkg/deb/debian_dh9/keydb-pro-server.logrotate b/pkg/deb/debian_dh9/keydb-enterprise-server.logrotate similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.logrotate rename to pkg/deb/debian_dh9/keydb-enterprise-server.logrotate diff --git a/pkg/deb/debian_dh9/keydb-pro-server.maintscript b/pkg/deb/debian_dh9/keydb-enterprise-server.maintscript similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.maintscript rename to pkg/deb/debian_dh9/keydb-enterprise-server.maintscript diff --git a/pkg/deb/debian_dh9/keydb-enterprise-server.manpages b/pkg/deb/debian_dh9/keydb-enterprise-server.manpages new file mode 100644 index 000000000..f66cf18d1 --- /dev/null +++ b/pkg/deb/debian_dh9/keydb-enterprise-server.manpages @@ -0,0 +1 @@ +debian/keydb-enterprise-server.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-server.postinst b/pkg/deb/debian_dh9/keydb-enterprise-server.postinst similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.postinst rename to pkg/deb/debian_dh9/keydb-enterprise-server.postinst diff --git a/pkg/deb/debian_dh9/keydb-pro-server.postrm b/pkg/deb/debian_dh9/keydb-enterprise-server.postrm similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.postrm rename to pkg/deb/debian_dh9/keydb-enterprise-server.postrm diff --git a/pkg/deb/debian_dh9/keydb-pro-server.prerm b/pkg/deb/debian_dh9/keydb-enterprise-server.prerm similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-server.prerm rename to pkg/deb/debian_dh9/keydb-enterprise-server.prerm diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.examples b/pkg/deb/debian_dh9/keydb-enterprise-tools.examples similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-tools.examples rename to pkg/deb/debian_dh9/keydb-enterprise-tools.examples diff --git a/pkg/deb/debian/keydb-pro-tools.install b/pkg/deb/debian_dh9/keydb-enterprise-tools.install similarity index 87% rename from pkg/deb/debian/keydb-pro-tools.install rename to pkg/deb/debian_dh9/keydb-enterprise-tools.install index 346ad4597..166faeafd 100644 --- a/pkg/deb/debian/keydb-pro-tools.install +++ b/pkg/deb/debian_dh9/keydb-enterprise-tools.install @@ -3,5 +3,5 @@ src/keydb-benchmark /usr/bin src/keydb-check-aof /usr/bin src/keydb-check-rdb /usr/bin src/keydb-cli /usr/bin -src/keydb-pro-server /usr/bin +src/keydb-server /usr/bin src/keydb-sentinel /usr/bin diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.manpages b/pkg/deb/debian_dh9/keydb-enterprise-tools.manpages similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-tools.manpages rename to pkg/deb/debian_dh9/keydb-enterprise-tools.manpages diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.postinst b/pkg/deb/debian_dh9/keydb-enterprise-tools.postinst similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-tools.postinst rename to pkg/deb/debian_dh9/keydb-enterprise-tools.postinst diff --git a/pkg/deb/debian_dh9/keydb-pro-tools.postrm b/pkg/deb/debian_dh9/keydb-enterprise-tools.postrm similarity index 100% rename from pkg/deb/debian_dh9/keydb-pro-tools.postrm rename to pkg/deb/debian_dh9/keydb-enterprise-tools.postrm diff --git a/pkg/deb/debian_dh9/keydb-pro-sentinel.manpages b/pkg/deb/debian_dh9/keydb-pro-sentinel.manpages deleted file mode 100644 index 08ce51ff5..000000000 --- a/pkg/deb/debian_dh9/keydb-pro-sentinel.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-pro-sentinel.1 diff --git a/pkg/deb/debian_dh9/keydb-pro-server.manpages b/pkg/deb/debian_dh9/keydb-pro-server.manpages deleted file mode 100644 index 06ff67ee3..000000000 --- a/pkg/deb/debian_dh9/keydb-pro-server.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-pro-server.1 diff --git a/pkg/deb/debian_dh9/source/include-binaries b/pkg/deb/debian_dh9/source/include-binaries index 55422f4bb..aa70b47d3 100644 --- a/pkg/deb/debian_dh9/source/include-binaries +++ b/pkg/deb/debian_dh9/source/include-binaries @@ -1,3 +1,3 @@ -keydb-pro_5.0.6.orig.tar.gz -keydb-pro_5.0.6-1~bionic1.debian.tar.xz +keydb-enterprise_5.0.6.orig.tar.gz +keydb-enterprise_5.0.6-1~bionic1.debian.tar.xz diff --git a/pkg/deb/debian_dh9/source/lintian-overrides b/pkg/deb/debian_dh9/source/lintian-overrides index 44dec9b63..ebc49b26e 100644 --- a/pkg/deb/debian_dh9/source/lintian-overrides +++ b/pkg/deb/debian_dh9/source/lintian-overrides @@ -1,2 +1,2 @@ # Upstream do not provide signed tarballs. -keydb-pro source: debian-watch-does-not-check-gpg-signature +keydb-enterprise source: debian-watch-does-not-check-gpg-signature diff --git a/pkg/deb/debian_dh9/watch b/pkg/deb/debian_dh9/watch index acca0f199..2dac38351 100644 --- a/pkg/deb/debian_dh9/watch +++ b/pkg/deb/debian_dh9/watch @@ -1,3 +1,3 @@ version=6 opts=uversionmangle=s/-?(alpha|beta|rc)/~$1/ \ - https://github.com/JohnSully/KeyDB-Pro/releases .*/archive/(.*).tar.gz + https://gitlab.eqalpha.com/keydb-dev/KeyDB-Pro/releases .*/archive/(.*).tar.gz diff --git a/pkg/deb/master_changelog b/pkg/deb/master_changelog index e92f8cc95..c5b91f9fa 100644 --- a/pkg/deb/master_changelog +++ b/pkg/deb/master_changelog @@ -1,58 +1,5 @@ -keydb-pro (6:6.0.12-1distribution_placeholder) codename_placeholder; urgency=medium +keydb-enterprise (6:6.0.12-1distribution_placeholder) codename_placeholder; urgency=medium * 6.0.12 Enable SCAN for MVCC -- Ben Schermel Fri, 10 Jul 2020 20:00:37 +0000 - -keydb-pro (6:6.0.11-1distribution_placeholder) codename_placeholder; urgency=medium - - * 6.0.11 fixes applied related to cluster usage and expires - - -- Ben Schermel Wed, 17 Jun 2020 20:00:37 +0000 - -keydb-pro (6:6.0.9-1distribution_placeholder) codename_placeholder; urgency=medium - - * 6.0.9 Addressing issues 187 - cpu lockup with subkey expire, 190 - missing sentinel binary in keydb-tools. - * FLASH performance updates, including updating client handling to mitigate SSD overload behavior on heavy writes. - * flash_memory parameter has been added to INFO memory - - -- Ben Schermel Sun, 07 Jun 2020 18:00:37 +0000 - -keydb-pro (6:6.0.8-1distribution_placeholder) codename_placeholder; urgency=medium - - * This is our first release to fully support all Redis 6.0.4 features, including but not limited to: TLS Support (fully supports multithreading!), Client side caching, RESP 3 Support - * KeyDB Has also added the following new features: Improved memory efficiency for short strings, Fastlock autotuning, KeyDB.HRENAME (rename a member of a hash)In addition we've spent a lot of time focussing on stability. - * The following bug fixes are resolved: #150 - Deadlock in ReplicationFeedMonitors, #170 - KeyDB dying via SIGABORT, #180 - crash after setting maxclients via cmd line, #169 - Write performance of a master dropped sharply when a slave is added - * In addition untracked issues were resolved: Potential deadlock when entering futex sleep, Pub/Sub Async messages may not be sent in a timely manner when load is low, Excessive logging during failed RREPLAY, KeyDB unresponsive handling clients on different threads during RDB load - * Updated deb package builds to build from source and phasing out init.d. dh_installsystemd from deb helper 11 used where applicable - * Naming conventions are now updated [ keydbpackage_version-build~distribution_architecture] and master changelog included and maintained - * keydb-pro-server binary is no longer inluded in the open source package - - -- Ben Schermel Mon, 1 Jun 2020 8:00:37 +0000 - -keydb-pro (5:5.1.12-1chl1distribution_placeholder) codename_placeholder; urgency=medium - - * 5.1.1 update. This update fixes several rare deadlock scenarios. Deadlock detection is also added. - - -- Ben Schermel Fri, 25 Oct 2019 8:00:37 +0000 - - -keydb-pro (5:5.1.11-1chl1distribution_placeholder) codename_placeholder; urgency=medium - - * 5.1 release. This release includes subkey expires (EXPIREMEMBER/EXPIREMEMBERAT), with updates to PTTL/TTL accordingly. New OBJECT LASTMODIFIED, BITIOP LSHIFT & BITOP RSHIFT commands. See https://docs.keydb.dev/blog/2019/10/20/blog-post/ for detailed review of release. - - -- Ben Schermel Mon, 21 Oct 2019 8:00:37 +0000 - - -keydb-pro (5:5.0.1-1chl1distribution_placeholder) codename_placeholder; urgency=medium - - * Arm build now included for bionic package - - -- Ben Schermel Wed, 21 Aug 2019 22:58:37 +0000 - - -keydb-pro (5:5.0.0-1chl1distribution_placeholder) codename_placeholder; urgency=medium - - * Initial release of KeyDB PPA. This PPA was originally derived from https://launchpad.net/~chris-lea/+archive/ubuntu/redis-server - - -- Ben Schermel Wed, 21 Aug 2019 2:58:37 +0000 diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile index c71353b00..8528aabb5 100644 --- a/pkg/docker/Dockerfile +++ b/pkg/docker/Dockerfile @@ -88,4 +88,4 @@ ENTRYPOINT ["docker-entrypoint.sh"] # Expose container port and start KeyDB by default on running container EXPOSE 6379 -CMD ["keydb-pro-server", "/etc/keydb/keydb.conf"] +CMD ["keydb-server", "/etc/keydb/keydb.conf"] diff --git a/pkg/rpm/generate_rpms.sh b/pkg/rpm/generate_rpms.sh index 2f5959c89..93d2980f4 100755 --- a/pkg/rpm/generate_rpms.sh +++ b/pkg/rpm/generate_rpms.sh @@ -31,8 +31,8 @@ sed -i '3d' $DIR/keydb_build/keydb.spec sed -i -E "2a\Release : $release%{?dist}" $DIR/keydb_build/keydb.spec # yum install -y scl-utils centos-release-scl rpm-build -mkdir -p /root/rpmbuild/BUILDROOT/keydb-pro-$version-$release.$dist.$arch -cp -r $DIR/keydb_build/keydb_rpm/* /root/rpmbuild/BUILDROOT/keydb-pro-$version-$release.$dist.$arch/ +mkdir -p /root/rpmbuild/BUILDROOT/keydb-enterprise-$version-$release.$dist.$arch +cp -r $DIR/keydb_build/keydb_rpm/* /root/rpmbuild/BUILDROOT/keydb-enterprise-$version-$release.$dist.$arch/ rpmbuild -bb $DIR/keydb_build/keydb.spec mv /root/rpmbuild/RPMS/$arch/* $DIR/rpm_files_generated diff --git a/pkg/rpm/keydb_build/keydb.spec b/pkg/rpm/keydb_build/keydb.spec index 8c47c178c..8fd826937 100755 --- a/pkg/rpm/keydb_build/keydb.spec +++ b/pkg/rpm/keydb_build/keydb.spec @@ -1,4 +1,4 @@ -Name : keydb-pro +Name : keydb-enterprise Version : 6.0.5 Release : 1%{?dist} Group : Unspecified @@ -27,7 +27,7 @@ getent group keydb &> /dev/null || \ groupadd -r keydb &> /dev/null getent passwd keydb &> /dev/null || \ useradd -r -g keydb -d /var/lib/keydb -s /sbin/nologin \ --c 'KeyDB Professional Database Server' keydb &> /dev/null +-c 'KeyDB Enterprise Database Server' keydb &> /dev/null exit 0 #postinstall scriptlet (using /bin/sh): diff --git a/pkg/rpm/keydb_build/keydb_rpm/usr/lib/systemd/system/keydb.service b/pkg/rpm/keydb_build/keydb_rpm/usr/lib/systemd/system/keydb.service index 861c7a384..e36f5f2cf 100644 --- a/pkg/rpm/keydb_build/keydb_rpm/usr/lib/systemd/system/keydb.service +++ b/pkg/rpm/keydb_build/keydb_rpm/usr/lib/systemd/system/keydb.service @@ -5,7 +5,7 @@ Documentation=https://docs.keydb.dev, man:keydb-server(1) [Service] Type=forking -ExecStart=/usr/bin/keydb-pro-server /etc/keydb/keydb.conf +ExecStart=/usr/bin/keydb-server /etc/keydb/keydb.conf ExecStop=/bin/kill -s TERM $MAINPID PIDFile=/var/run/keydb/keydb-server.pid TimeoutStopSec=0