From ddde8abfc72d828aff9f7a0692529e03991efd13 Mon Sep 17 00:00:00 2001 From: Ben Schermel Date: Mon, 8 Jun 2020 23:16:02 -0400 Subject: [PATCH] fix issues from rebase Former-commit-id: 5d7cc28208bbe7b49eed0d1b1c2bb1c31e65e865 --- pkg/deb/debian/control | 5 -- pkg/deb/debian/keydb-sentinel.1 | 23 ----- pkg/deb/debian/keydb-sentinel.install | 2 - pkg/deb/debian/keydb-sentinel.logrotate | 7 -- pkg/deb/debian/keydb-sentinel.manpages | 1 - pkg/deb/debian/keydb-sentinel.postinst | 26 ------ pkg/deb/debian/keydb-sentinel.postrm | 16 ---- pkg/deb/debian/keydb-server.1 | 23 ----- pkg/deb/debian/keydb-server.docs | 1 - pkg/deb/debian/keydb-server.install | 2 - pkg/deb/debian/keydb-server.logrotate | 7 -- pkg/deb/debian/keydb-server.manpages | 1 - pkg/deb/debian/keydb-server.postinst | 26 ------ pkg/deb/debian/keydb-server.postrm | 16 ---- pkg/deb/debian/keydb-tools.examples | 2 - pkg/deb/debian/keydb-tools.install | 7 -- pkg/deb/debian/keydb-tools.manpages | 4 - pkg/deb/debian/keydb-tools.postinst | 47 ---------- pkg/deb/debian/keydb-tools.postrm | 13 --- pkg/deb/debian_dh9/keydb-sentinel.1 | 23 ----- pkg/deb/debian_dh9/keydb-sentinel.default | 8 -- pkg/deb/debian_dh9/keydb-sentinel.init | 89 ------------------- pkg/deb/debian_dh9/keydb-sentinel.install | 2 - pkg/deb/debian_dh9/keydb-sentinel.logrotate | 7 -- pkg/deb/debian_dh9/keydb-sentinel.maintscript | 4 - pkg/deb/debian_dh9/keydb-sentinel.manpages | 1 - pkg/deb/debian_dh9/keydb-sentinel.postinst | 24 ----- pkg/deb/debian_dh9/keydb-sentinel.postrm | 14 --- pkg/deb/debian_dh9/keydb-server.1 | 23 ----- pkg/deb/debian_dh9/keydb-server.default | 7 -- pkg/deb/debian_dh9/keydb-server.docs | 1 - pkg/deb/debian_dh9/keydb-server.init | 89 ------------------- pkg/deb/debian_dh9/keydb-server.install | 2 - pkg/deb/debian_dh9/keydb-server.logrotate | 7 -- pkg/deb/debian_dh9/keydb-server.maintscript | 4 - pkg/deb/debian_dh9/keydb-server.manpages | 1 - pkg/deb/debian_dh9/keydb-server.postinst | 24 ----- pkg/deb/debian_dh9/keydb-server.postrm | 14 --- pkg/deb/debian_dh9/keydb-tools.examples | 2 - pkg/deb/debian_dh9/keydb-tools.install | 7 -- pkg/deb/debian_dh9/keydb-tools.manpages | 4 - pkg/deb/debian_dh9/keydb-tools.postinst | 47 ---------- pkg/deb/debian_dh9/keydb-tools.postrm | 13 --- pkg/deb/debian_dh9/rules | 6 +- 44 files changed, 3 insertions(+), 649 deletions(-) delete mode 100644 pkg/deb/debian/keydb-sentinel.1 delete mode 100644 pkg/deb/debian/keydb-sentinel.install delete mode 100644 pkg/deb/debian/keydb-sentinel.logrotate delete mode 100644 pkg/deb/debian/keydb-sentinel.manpages delete mode 100644 pkg/deb/debian/keydb-sentinel.postinst delete mode 100644 pkg/deb/debian/keydb-sentinel.postrm delete mode 100644 pkg/deb/debian/keydb-server.1 delete mode 100644 pkg/deb/debian/keydb-server.docs delete mode 100644 pkg/deb/debian/keydb-server.install delete mode 100644 pkg/deb/debian/keydb-server.logrotate delete mode 100644 pkg/deb/debian/keydb-server.manpages delete mode 100644 pkg/deb/debian/keydb-server.postinst delete mode 100644 pkg/deb/debian/keydb-server.postrm delete mode 100644 pkg/deb/debian/keydb-tools.examples delete mode 100644 pkg/deb/debian/keydb-tools.install delete mode 100644 pkg/deb/debian/keydb-tools.manpages delete mode 100644 pkg/deb/debian/keydb-tools.postinst delete mode 100644 pkg/deb/debian/keydb-tools.postrm delete mode 100644 pkg/deb/debian_dh9/keydb-sentinel.1 delete mode 100755 pkg/deb/debian_dh9/keydb-sentinel.default delete mode 100755 pkg/deb/debian_dh9/keydb-sentinel.init delete mode 100644 pkg/deb/debian_dh9/keydb-sentinel.install delete mode 100644 pkg/deb/debian_dh9/keydb-sentinel.logrotate delete mode 100644 pkg/deb/debian_dh9/keydb-sentinel.maintscript delete mode 100644 pkg/deb/debian_dh9/keydb-sentinel.manpages delete mode 100644 pkg/deb/debian_dh9/keydb-sentinel.postinst delete mode 100644 pkg/deb/debian_dh9/keydb-sentinel.postrm delete mode 100644 pkg/deb/debian_dh9/keydb-server.1 delete mode 100755 pkg/deb/debian_dh9/keydb-server.default delete mode 100644 pkg/deb/debian_dh9/keydb-server.docs delete mode 100755 pkg/deb/debian_dh9/keydb-server.init delete mode 100644 pkg/deb/debian_dh9/keydb-server.install delete mode 100644 pkg/deb/debian_dh9/keydb-server.logrotate delete mode 100644 pkg/deb/debian_dh9/keydb-server.maintscript delete mode 100644 pkg/deb/debian_dh9/keydb-server.manpages delete mode 100644 pkg/deb/debian_dh9/keydb-server.postinst delete mode 100644 pkg/deb/debian_dh9/keydb-server.postrm delete mode 100644 pkg/deb/debian_dh9/keydb-tools.examples delete mode 100644 pkg/deb/debian_dh9/keydb-tools.install delete mode 100644 pkg/deb/debian_dh9/keydb-tools.manpages delete mode 100644 pkg/deb/debian_dh9/keydb-tools.postinst delete mode 100644 pkg/deb/debian_dh9/keydb-tools.postrm diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control index f847ad345..5a46e1848 100644 --- a/pkg/deb/debian/control +++ b/pkg/deb/debian/control @@ -6,11 +6,6 @@ Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.17.5), systemd, -# libhiredis-dev (>= 0.14.0), -# libjemalloc-dev [linux-any], -# liblua5.1-dev, -# lua-bitop-dev, -# lua-cjson-dev, procps , build-essential , tcl , diff --git a/pkg/deb/debian/keydb-sentinel.1 b/pkg/deb/debian/keydb-sentinel.1 deleted file mode 100644 index 782a40ff4..000000000 --- a/pkg/deb/debian/keydb-sentinel.1 +++ /dev/null @@ -1,23 +0,0 @@ -.TH KEYDB-SENTINEL 1 "August 17, 2019" -.SH NAME -keydb-sentinel \- Persistent key-value database (cluster mode) -.SH SYNOPSIS -.B keydb-sentinel -.RI configfile -.SH DESCRIPTION -KeyDB is a key-value database. It is similar to memcached but the dataset is -not volatile and other datatypes (such as lists and sets) are natively -supported. -.PP -.SH OPTIONS -.IP "configfile" -Read options from specified configuration file. -.SH NOTES -On Debian GNU/Linux systems, \fBkeydb-sentinel\fP is typically started via the -\fB/etc/init.d/keydb-sentinel\fP initscript, not manually. This defaults to using -\fB/etc/keydb/sentinel.conf\fP as a configuration file. -.SH AUTHOR -\fBkeydb-sentinel\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo. -.PP -This manual page was written by Chris Lamb for the Debian -project (but may be used by others). Modified by Ben Schermel diff --git a/pkg/deb/debian/keydb-sentinel.install b/pkg/deb/debian/keydb-sentinel.install deleted file mode 100644 index 524d7867b..000000000 --- a/pkg/deb/debian/keydb-sentinel.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/keydb-sentinel.service /lib/systemd/system/ -pkg/deb/conf/sentinel.conf /etc/keydb diff --git a/pkg/deb/debian/keydb-sentinel.logrotate b/pkg/deb/debian/keydb-sentinel.logrotate deleted file mode 100644 index 185010396..000000000 --- a/pkg/deb/debian/keydb-sentinel.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/keydb/keydb-sentinel*.log { - weekly - missingok - rotate 12 - compress - notifempty -} diff --git a/pkg/deb/debian/keydb-sentinel.manpages b/pkg/deb/debian/keydb-sentinel.manpages deleted file mode 100644 index 1b3d9d4a1..000000000 --- a/pkg/deb/debian/keydb-sentinel.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-sentinel.1 diff --git a/pkg/deb/debian/keydb-sentinel.postinst b/pkg/deb/debian/keydb-sentinel.postinst deleted file mode 100644 index 787464165..000000000 --- a/pkg/deb/debian/keydb-sentinel.postinst +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -eu - -USER="keydb" -GROUP="$USER" -CONFFILE="/etc/keydb/sentinel.conf" - -if [ "$1" = "configure" ] -then - if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1 - then - dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE} - fi -fi - -#DEBHELPER# - -if [ "$1" = "configure" ] -then - find /etc/keydb -maxdepth 1 -type d -name 'keydb-sentinel.*.d' -empty -delete -fi - -systemctl daemon-reload - -exit 0 diff --git a/pkg/deb/debian/keydb-sentinel.postrm b/pkg/deb/debian/keydb-sentinel.postrm deleted file mode 100644 index 2ce8771df..000000000 --- a/pkg/deb/debian/keydb-sentinel.postrm +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -eu - -CONFFILE="/etc/keydb/sentinel.conf" - -if [ "$1" = "purge" ] -then - dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2 -fi - -#DEBHELPER# - -systemctl daemon-reload - -exit 0 diff --git a/pkg/deb/debian/keydb-server.1 b/pkg/deb/debian/keydb-server.1 deleted file mode 100644 index 2bac395f8..000000000 --- a/pkg/deb/debian/keydb-server.1 +++ /dev/null @@ -1,23 +0,0 @@ -.TH KEYDB-SERVER 1 "August 17, 2019" -.SH NAME -keydb-server \- Persistent key-value database -.SH SYNOPSIS -.B keydb-server -.RI configfile -.SH DESCRIPTION -KeyDB is a key-value database. It is similar to memcached but the dataset is -not volatile and other datatypes (such as lists and sets) are natively -supported. -.PP -.SH OPTIONS -.IP "configfile" -Read options from specified configuration file. -.SH NOTES -On Debian GNU/Linux systems, \fBkeydb-server\fP is typically started via the -\fB/etc/init.d/keydb-server\fP initscript, not manually. This defaults to using -\fB/etc/keydb/keydb.conf\fP as a configuration file. -.SH AUTHOR -\fBkeydb-server\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo. -.PP -This manual page was written by Chris Lamb for the Debian -project (but may be used by others). Modified by Ben Schermel diff --git a/pkg/deb/debian/keydb-server.docs b/pkg/deb/debian/keydb-server.docs deleted file mode 100644 index b43bf86b5..000000000 --- a/pkg/deb/debian/keydb-server.docs +++ /dev/null @@ -1 +0,0 @@ -README.md diff --git a/pkg/deb/debian/keydb-server.install b/pkg/deb/debian/keydb-server.install deleted file mode 100644 index 8a82461af..000000000 --- a/pkg/deb/debian/keydb-server.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/keydb-server.service /lib/systemd/system/ -pkg/deb/conf/keydb.conf /etc/keydb diff --git a/pkg/deb/debian/keydb-server.logrotate b/pkg/deb/debian/keydb-server.logrotate deleted file mode 100644 index 78d0a53ea..000000000 --- a/pkg/deb/debian/keydb-server.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/keydb/keydb-server*.log { - weekly - missingok - rotate 12 - compress - notifempty -} diff --git a/pkg/deb/debian/keydb-server.manpages b/pkg/deb/debian/keydb-server.manpages deleted file mode 100644 index 3935e22fd..000000000 --- a/pkg/deb/debian/keydb-server.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-server.1 diff --git a/pkg/deb/debian/keydb-server.postinst b/pkg/deb/debian/keydb-server.postinst deleted file mode 100644 index 9d48ee638..000000000 --- a/pkg/deb/debian/keydb-server.postinst +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -eu - -USER="keydb" -GROUP="$USER" -CONFFILE="/etc/keydb/keydb.conf" - -if [ "$1" = "configure" ] -then - if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1 - then - dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE} - fi -fi - -#DEBHELPER# - -if [ "$1" = "configure" ] -then - find /etc/keydb -maxdepth 1 -type d -name 'keydb-server.*.d' -empty -delete -fi - -systemctl daemon-reload - -exit 0 diff --git a/pkg/deb/debian/keydb-server.postrm b/pkg/deb/debian/keydb-server.postrm deleted file mode 100644 index cf57953c3..000000000 --- a/pkg/deb/debian/keydb-server.postrm +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -eu - -CONFFILE="/etc/keydb/keydb.conf" - -if [ "${1}" = "purge" ] -then - dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2 -fi - -#DEBHELPER# - -systemctl daemon-reload - -exit 0 diff --git a/pkg/deb/debian/keydb-tools.examples b/pkg/deb/debian/keydb-tools.examples deleted file mode 100644 index 7f796a1b4..000000000 --- a/pkg/deb/debian/keydb-tools.examples +++ /dev/null @@ -1,2 +0,0 @@ -src/redis-trib.rb -utils/lru diff --git a/pkg/deb/debian/keydb-tools.install b/pkg/deb/debian/keydb-tools.install deleted file mode 100644 index 166faeafd..000000000 --- a/pkg/deb/debian/keydb-tools.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/bash_completion.d/* /usr/share/bash-completion/completions -src/keydb-benchmark /usr/bin -src/keydb-check-aof /usr/bin -src/keydb-check-rdb /usr/bin -src/keydb-cli /usr/bin -src/keydb-server /usr/bin -src/keydb-sentinel /usr/bin diff --git a/pkg/deb/debian/keydb-tools.manpages b/pkg/deb/debian/keydb-tools.manpages deleted file mode 100644 index bfe26d2d6..000000000 --- a/pkg/deb/debian/keydb-tools.manpages +++ /dev/null @@ -1,4 +0,0 @@ -debian/keydb-benchmark.1 -debian/keydb-check-aof.1 -debian/keydb-check-rdb.1 -debian/keydb-cli.1 diff --git a/pkg/deb/debian/keydb-tools.postinst b/pkg/deb/debian/keydb-tools.postinst deleted file mode 100644 index 0007d887f..000000000 --- a/pkg/deb/debian/keydb-tools.postinst +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -set -eu - -USER="keydb" - -Setup_dir () { - DIR="${1}" - MODE="${2}" - GROUP="${3}" - - mkdir -p ${DIR} - - case "${DIR}" in - /var/log/keydb) - MODE="02750" - GROUP="adm" - ;; - *) - MODE="750" - GROUP="${USER}" - ;; - esac - - if ! dpkg-statoverride --list ${DIR} >/dev/null 2>&1 - then - chown ${USER}:${GROUP} ${DIR} - chmod ${MODE} ${DIR} - fi -} - -if [ "$1" = "configure" ] -then - adduser \ - --system \ - --home /var/lib/keydb \ - --quiet \ - --group \ - ${USER} || true - - Setup_dir /var/log/keydb ${USER}:adm 2750 - Setup_dir /var/lib/keydb ${USER}:${USER} 750 -fi - -#DEBHELPER# - -exit 0 diff --git a/pkg/deb/debian/keydb-tools.postrm b/pkg/deb/debian/keydb-tools.postrm deleted file mode 100644 index 60c932435..000000000 --- a/pkg/deb/debian/keydb-tools.postrm +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -eu - -if [ "${1}" = "purge" ] -then - userdel keydb || true - rm -rf /var/lib/keydb /var/log/keydb -fi - -#DEBHELPER# - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-sentinel.1 b/pkg/deb/debian_dh9/keydb-sentinel.1 deleted file mode 100644 index 782a40ff4..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.1 +++ /dev/null @@ -1,23 +0,0 @@ -.TH KEYDB-SENTINEL 1 "August 17, 2019" -.SH NAME -keydb-sentinel \- Persistent key-value database (cluster mode) -.SH SYNOPSIS -.B keydb-sentinel -.RI configfile -.SH DESCRIPTION -KeyDB is a key-value database. It is similar to memcached but the dataset is -not volatile and other datatypes (such as lists and sets) are natively -supported. -.PP -.SH OPTIONS -.IP "configfile" -Read options from specified configuration file. -.SH NOTES -On Debian GNU/Linux systems, \fBkeydb-sentinel\fP is typically started via the -\fB/etc/init.d/keydb-sentinel\fP initscript, not manually. This defaults to using -\fB/etc/keydb/sentinel.conf\fP as a configuration file. -.SH AUTHOR -\fBkeydb-sentinel\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo. -.PP -This manual page was written by Chris Lamb for the Debian -project (but may be used by others). Modified by Ben Schermel diff --git a/pkg/deb/debian_dh9/keydb-sentinel.default b/pkg/deb/debian_dh9/keydb-sentinel.default deleted file mode 100755 index 05a3b73b0..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.default +++ /dev/null @@ -1,8 +0,0 @@ -# keydb-sentinel configure options - -# ULIMIT: Call ulimit -n with this argument prior to invoking KeyDB Sentinel -# itself. This may be required for high-concurrency environments. KeyDB -# Sentinel itself cannot alter its limits as it is not being run as root. -# (default: 65536) -# -ULIMIT=65536 diff --git a/pkg/deb/debian_dh9/keydb-sentinel.init b/pkg/deb/debian_dh9/keydb-sentinel.init deleted file mode 100755 index 1ec8b9a95..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.init +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: keydb-sentinel -# Required-Start: $syslog $remote_fs -# Required-Stop: $syslog $remote_fs -# Should-Start: $local_fs -# Should-Stop: $local_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: keydb-sentinel - Persistent key-value db monitor -# Description: keydb-sentinel - Persistent key-value db monitor -### END INIT INFO - - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/keydb-sentinel -DAEMON_ARGS=/etc/keydb/sentinel.conf -NAME=keydb-sentinel -DESC=keydb-sentinel - -RUNDIR=/var/run/sentinel -PIDFILE=$RUNDIR/keydb-sentinel.pid - -test -x $DAEMON || exit 0 - -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi - -. /lib/lsb/init-functions - -set -e - -if [ "$(id -u)" != "0" ] -then - log_failure_msg "Must be run as root." - exit 1 -fi - -case "$1" in - start) - echo -n "Starting $DESC: " - mkdir -p $RUNDIR - touch $PIDFILE - chown keydb:keydb $RUNDIR $PIDFILE - chmod 755 $RUNDIR - - if [ -n "$ULIMIT" ] - then - ulimit -n $ULIMIT || true - fi - - if start-stop-daemon --start --quiet --oknodo --umask 007 --pidfile $PIDFILE --chuid keydb:keydb --exec $DAEMON -- $DAEMON_ARGS - then - echo "$NAME." - else - echo "failed" - fi - ;; - stop) - echo -n "Stopping $DESC: " - - if start-stop-daemon --stop --retry forever/TERM/1 --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON - then - echo "$NAME." - else - echo "failed" - fi - rm -f $PIDFILE - sleep 1 - ;; - - restart|force-reload) - ${0} stop - ${0} start - ;; - - status) - status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME} - ;; - - *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-sentinel.install b/pkg/deb/debian_dh9/keydb-sentinel.install deleted file mode 100644 index 600ef543c..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/keydb-sentinel.service /lib/systemd/system -pkg/deb/conf/sentinel.conf /etc/keydb diff --git a/pkg/deb/debian_dh9/keydb-sentinel.logrotate b/pkg/deb/debian_dh9/keydb-sentinel.logrotate deleted file mode 100644 index 185010396..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/keydb/keydb-sentinel*.log { - weekly - missingok - rotate 12 - compress - notifempty -} diff --git a/pkg/deb/debian_dh9/keydb-sentinel.maintscript b/pkg/deb/debian_dh9/keydb-sentinel.maintscript deleted file mode 100644 index 87e4f024c..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.maintscript +++ /dev/null @@ -1,4 +0,0 @@ -rm_conffile /etc/keydb/keydb-sentinel.post-down.d/00_example 4:4.0.2-3~ -rm_conffile /etc/keydb/keydb-sentinel.post-up.d/00_example 4:4.0.2-3~ -rm_conffile /etc/keydb/keydb-sentinel.pre-down.d/00_example 4:4.0.2-3~ -rm_conffile /etc/keydb/keydb-sentinel.pre-up.d/00_example 4:4.0.2-3~ diff --git a/pkg/deb/debian_dh9/keydb-sentinel.manpages b/pkg/deb/debian_dh9/keydb-sentinel.manpages deleted file mode 100644 index 1b3d9d4a1..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-sentinel.1 diff --git a/pkg/deb/debian_dh9/keydb-sentinel.postinst b/pkg/deb/debian_dh9/keydb-sentinel.postinst deleted file mode 100644 index 0c856c5c5..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -eu - -USER="keydb" -GROUP="$USER" -CONFFILE="/etc/keydb/sentinel.conf" - -if [ "$1" = "configure" ] -then - if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1 - then - dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE} - fi -fi - -#DEBHELPER# - -if [ "$1" = "configure" ] -then - find /etc/keydb -maxdepth 1 -type d -name 'keydb-sentinel.*.d' -empty -delete -fi - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-sentinel.postrm b/pkg/deb/debian_dh9/keydb-sentinel.postrm deleted file mode 100644 index 2e9f62888..000000000 --- a/pkg/deb/debian_dh9/keydb-sentinel.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -eu - -CONFFILE="/etc/keydb/sentinel.conf" - -if [ "$1" = "purge" ] -then - dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2 -fi - -#DEBHELPER# - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-server.1 b/pkg/deb/debian_dh9/keydb-server.1 deleted file mode 100644 index 2bac395f8..000000000 --- a/pkg/deb/debian_dh9/keydb-server.1 +++ /dev/null @@ -1,23 +0,0 @@ -.TH KEYDB-SERVER 1 "August 17, 2019" -.SH NAME -keydb-server \- Persistent key-value database -.SH SYNOPSIS -.B keydb-server -.RI configfile -.SH DESCRIPTION -KeyDB is a key-value database. It is similar to memcached but the dataset is -not volatile and other datatypes (such as lists and sets) are natively -supported. -.PP -.SH OPTIONS -.IP "configfile" -Read options from specified configuration file. -.SH NOTES -On Debian GNU/Linux systems, \fBkeydb-server\fP is typically started via the -\fB/etc/init.d/keydb-server\fP initscript, not manually. This defaults to using -\fB/etc/keydb/keydb.conf\fP as a configuration file. -.SH AUTHOR -\fBkeydb-server\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo. -.PP -This manual page was written by Chris Lamb for the Debian -project (but may be used by others). Modified by Ben Schermel diff --git a/pkg/deb/debian_dh9/keydb-server.default b/pkg/deb/debian_dh9/keydb-server.default deleted file mode 100755 index 9288682fa..000000000 --- a/pkg/deb/debian_dh9/keydb-server.default +++ /dev/null @@ -1,7 +0,0 @@ -# keydb-server configure options - -# ULIMIT: Call ulimit -n with this argument prior to invoking Redis itself. -# This may be required for high-concurrency environments. KeyDB itself cannot -# alter its limits as it is not being run as root. (default: 65536) -# -ULIMIT=65536 diff --git a/pkg/deb/debian_dh9/keydb-server.docs b/pkg/deb/debian_dh9/keydb-server.docs deleted file mode 100644 index b43bf86b5..000000000 --- a/pkg/deb/debian_dh9/keydb-server.docs +++ /dev/null @@ -1 +0,0 @@ -README.md diff --git a/pkg/deb/debian_dh9/keydb-server.init b/pkg/deb/debian_dh9/keydb-server.init deleted file mode 100755 index 4d0de9149..000000000 --- a/pkg/deb/debian_dh9/keydb-server.init +++ /dev/null @@ -1,89 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: keydb-server -# Required-Start: $syslog $remote_fs -# Required-Stop: $syslog $remote_fs -# Should-Start: $local_fs -# Should-Stop: $local_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: keydb-server - Persistent key-value db -# Description: keydb-server - Persistent key-value db -### END INIT INFO - - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/bin/keydb-server -DAEMON_ARGS=/etc/keydb/keydb.conf -NAME=keydb-server -DESC=keydb-server - -RUNDIR=/var/run/keydb -PIDFILE=$RUNDIR/keydb-server.pid - -test -x $DAEMON || exit 0 - -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi - -. /lib/lsb/init-functions - -set -e - -if [ "$(id -u)" != "0" ] -then - log_failure_msg "Must be run as root." - exit 1 -fi - -case "$1" in - start) - echo -n "Starting $DESC: " - mkdir -p $RUNDIR - touch $PIDFILE - chown keydb:keydb $RUNDIR $PIDFILE - chmod 755 $RUNDIR - - if [ -n "$ULIMIT" ] - then - ulimit -n $ULIMIT || true - fi - - if start-stop-daemon --start --quiet --oknodo --umask 007 --pidfile $PIDFILE --chuid keydb:keydb --exec $DAEMON -- $DAEMON_ARGS - then - echo "$NAME." - else - echo "failed" - fi - ;; - stop) - echo -n "Stopping $DESC: " - - if start-stop-daemon --stop --retry forever/TERM/1 --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON - then - echo "$NAME." - else - echo "failed" - fi - rm -f $PIDFILE - sleep 1 - ;; - - restart|force-reload) - ${0} stop - ${0} start - ;; - - status) - status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME} - ;; - - *) - echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-server.install b/pkg/deb/debian_dh9/keydb-server.install deleted file mode 100644 index 1b86989b1..000000000 --- a/pkg/deb/debian_dh9/keydb-server.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/keydb-server.service /lib/systemd/system -pkg/deb/conf/keydb.conf /etc/keydb diff --git a/pkg/deb/debian_dh9/keydb-server.logrotate b/pkg/deb/debian_dh9/keydb-server.logrotate deleted file mode 100644 index 78d0a53ea..000000000 --- a/pkg/deb/debian_dh9/keydb-server.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/keydb/keydb-server*.log { - weekly - missingok - rotate 12 - compress - notifempty -} diff --git a/pkg/deb/debian_dh9/keydb-server.maintscript b/pkg/deb/debian_dh9/keydb-server.maintscript deleted file mode 100644 index d6ccfe60c..000000000 --- a/pkg/deb/debian_dh9/keydb-server.maintscript +++ /dev/null @@ -1,4 +0,0 @@ -rm_conffile /etc/keydb/keydb-server.post-down.d/00_example 4:4.0.2-3~ -rm_conffile /etc/keydb/keydb-server.post-up.d/00_example 4:4.0.2-3~ -rm_conffile /etc/keydb/keydb-server.pre-down.d/00_example 4:4.0.2-3~ -rm_conffile /etc/keydb/keydb-server.pre-up.d/00_example 4:4.0.2-3~ diff --git a/pkg/deb/debian_dh9/keydb-server.manpages b/pkg/deb/debian_dh9/keydb-server.manpages deleted file mode 100644 index 3935e22fd..000000000 --- a/pkg/deb/debian_dh9/keydb-server.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/keydb-server.1 diff --git a/pkg/deb/debian_dh9/keydb-server.postinst b/pkg/deb/debian_dh9/keydb-server.postinst deleted file mode 100644 index b53ce4142..000000000 --- a/pkg/deb/debian_dh9/keydb-server.postinst +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -eu - -USER="keydb" -GROUP="$USER" -CONFFILE="/etc/keydb/keydb.conf" - -if [ "$1" = "configure" ] -then - if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1 - then - dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE} - fi -fi - -#DEBHELPER# - -if [ "$1" = "configure" ] -then - find /etc/keydb -maxdepth 1 -type d -name 'keydb-server.*.d' -empty -delete -fi - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-server.postrm b/pkg/deb/debian_dh9/keydb-server.postrm deleted file mode 100644 index 16ef23bd7..000000000 --- a/pkg/deb/debian_dh9/keydb-server.postrm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -set -eu - -CONFFILE="/etc/keydb/keydb.conf" - -if [ "${1}" = "purge" ] -then - dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2 -fi - -#DEBHELPER# - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-tools.examples b/pkg/deb/debian_dh9/keydb-tools.examples deleted file mode 100644 index 7f796a1b4..000000000 --- a/pkg/deb/debian_dh9/keydb-tools.examples +++ /dev/null @@ -1,2 +0,0 @@ -src/redis-trib.rb -utils/lru diff --git a/pkg/deb/debian_dh9/keydb-tools.install b/pkg/deb/debian_dh9/keydb-tools.install deleted file mode 100644 index 80ffefe07..000000000 --- a/pkg/deb/debian_dh9/keydb-tools.install +++ /dev/null @@ -1,7 +0,0 @@ -debian/bash_completion.d/* /usr/share/bash-completion/completions -src/keydb-server /usr/bin -src/keydb-benchmark /usr/bin -src/keydb-check-aof /usr/bin -src/keydb-check-rdb /usr/bin -src/keydb-cli /usr/bin -src/keydb-sentinel /usr/bin diff --git a/pkg/deb/debian_dh9/keydb-tools.manpages b/pkg/deb/debian_dh9/keydb-tools.manpages deleted file mode 100644 index bfe26d2d6..000000000 --- a/pkg/deb/debian_dh9/keydb-tools.manpages +++ /dev/null @@ -1,4 +0,0 @@ -debian/keydb-benchmark.1 -debian/keydb-check-aof.1 -debian/keydb-check-rdb.1 -debian/keydb-cli.1 diff --git a/pkg/deb/debian_dh9/keydb-tools.postinst b/pkg/deb/debian_dh9/keydb-tools.postinst deleted file mode 100644 index 0007d887f..000000000 --- a/pkg/deb/debian_dh9/keydb-tools.postinst +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -set -eu - -USER="keydb" - -Setup_dir () { - DIR="${1}" - MODE="${2}" - GROUP="${3}" - - mkdir -p ${DIR} - - case "${DIR}" in - /var/log/keydb) - MODE="02750" - GROUP="adm" - ;; - *) - MODE="750" - GROUP="${USER}" - ;; - esac - - if ! dpkg-statoverride --list ${DIR} >/dev/null 2>&1 - then - chown ${USER}:${GROUP} ${DIR} - chmod ${MODE} ${DIR} - fi -} - -if [ "$1" = "configure" ] -then - adduser \ - --system \ - --home /var/lib/keydb \ - --quiet \ - --group \ - ${USER} || true - - Setup_dir /var/log/keydb ${USER}:adm 2750 - Setup_dir /var/lib/keydb ${USER}:${USER} 750 -fi - -#DEBHELPER# - -exit 0 diff --git a/pkg/deb/debian_dh9/keydb-tools.postrm b/pkg/deb/debian_dh9/keydb-tools.postrm deleted file mode 100644 index 60c932435..000000000 --- a/pkg/deb/debian_dh9/keydb-tools.postrm +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -eu - -if [ "${1}" = "purge" ] -then - userdel keydb || true - rm -rf /var/lib/keydb /var/log/keydb -fi - -#DEBHELPER# - -exit 0 diff --git a/pkg/deb/debian_dh9/rules b/pkg/deb/debian_dh9/rules index 0a8f0f1c6..e6b364993 100755 --- a/pkg/deb/debian_dh9/rules +++ b/pkg/deb/debian_dh9/rules @@ -32,9 +32,9 @@ override_dh_auto_install: override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # Avoid race conditions in upstream testsuite. -# ./runtest --clients 1 || true -# ./runtest-cluster || true -# ./runtest-sentinel || true + ./runtest --clients 1 || true + ./runtest-cluster || true + ./runtest-sentinel || true endif override_dh_auto_clean: