put user stuff in user, not system

7 files changed, 0 insertions, 204 deletions

diff --git a/system/redis/APKBUILD b/system/redis/APKBUILD
deleted file mode 100644
index fc8ea8426..000000000
--- a/system/redis/APKBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# Contributor: V.Krishn <vkrishn4@gmail.com>
-# Maintainer:
-pkgname=redis
-pkgver=4.0.2
-pkgrel=2
-pkgdesc="Advanced key-value store"
-url="http://redis.io/"
-arch="all"
-license="BSD"
-depends=""
-makedepends="linux-headers"
-checkdepends="tcl"
-splitpackages="$pkgname-openrc"
-install="redis.pre-install"
-pkgusers="redis"
-pkggroups="redis"
-source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz
-	fix-ppc-atomics.patch
-	posix-runtest.patch
-	redis.initd
-	redis.logrotate
-	redis.confd
-	"
-builddir="$srcdir/$pkgname-$pkgver"
-
-prepare() {
-	default_prepare
-
-	cd "$builddir"
-	sed -i -e 's|^daemonize .*|daemonize yes|' \
-		-e 's|^dir .*|dir /var/lib/redis/|' \
-		-e 's|^logfile .*|logfile /var/log/redis/redis\.log|' \
-		-e 's|^pidfile .*|pidfile /var/run/redis/redis\.pid|' \
-		-e 's|^loglevel .*|loglevel notice|' \
-		redis.conf
-
-	# disable broken tests
-	# see: https://github.com/antirez/redis/issues/2814
-	#      https://github.com/antirez/redis/issues/3810
-
-	sed -i -e '/integration\/aof/d' \
-	       -e '/integration\/logging/d' \
-		tests/test_helper.tcl
-}
-
-build() {
-	cd "$builddir"
-	make PREFIX=/usr \
-		INSTALL_BIN="$pkgdir"/usr/bin \
-		MALLOC=libc \
-		FINAL_LIBS="-latomic " \
-		all
-}
-
-check() {
-	cd "$builddir"
-	make test
-}
-
-package() {
-	cd "$builddir"
-	mkdir -p "$pkgdir"/usr/bin
-	install -d -o redis -g redis \
-		"$pkgdir"/var/lib/redis \
-		"$pkgdir"/var/log/redis \
-		"$pkgdir"/var/run/redis
-
-	install -D -m755 "$builddir/COPYING" \
-		"$pkgdir/usr/share/licenses/redis/COPYING"
-        install -D -m755 "$srcdir/redis.initd" "$pkgdir/etc/init.d/redis" \
-		&& install -Dm644 "$srcdir/redis.logrotate" \
-			"$pkgdir/etc/logrotate.d/redis" \
-		&& install -Dm644 "$srcdir/redis.confd" \
-			"$pkgdir/etc/conf.d/redis"
-        install -D -m644 "$builddir/redis.conf" "$pkgdir/etc/redis.conf"
-
-	make PREFIX=/usr \
-		INSTALL_BIN="$pkgdir/usr/bin" \
-		install
-}
-
-sha512sums="1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4  redis-4.0.2.tar.gz
-f768acea3e1868dbf0596085640c83e58d899860d7d647b0965fa858844c494d0a49b229fb417456d83f3e2690e5450950c31e0fa40529df85a9cde38d8981c4  fix-ppc-atomics.patch
-856ae98e9e8670801827c3bd793dc14ed2c62c37365f8d04b452d7e1ab97300a0bf18c59b52ea686c2689d53aeed8e29e2c55207d3d4fb1fd8fc7fc820f33157  posix-runtest.patch
-91b663f802aea9a473195940d3bf2ce3ca2af4e5b6e61a2d28ebbfe502ef2c764b574b7e87c49e60345d1a5d6b73d12920924c93b26be110c2ce824023347b6f  redis.initd
-6d17d169b40a7e23a0a2894eff0f3e2fe8e4461b36f2a9d45468f0abd84ea1035d679b4c0a34029bce093147f9c7bb697e843c113c17769d38c934d4a78a5848  redis.logrotate
-d87aad6185300c99cc9b6a478c83bf62c450fb2c225592d74cc43a3adb93e19d8d2a42cc279907b385aa73a7b9c77b66828dbfb001009edc16a604abb2087e99  redis.confd"
diff --git a/system/redis/fix-ppc-atomics.patch b/system/redis/fix-ppc-atomics.patch
deleted file mode 100644
index 0263bb531..000000000
--- a/system/redis/fix-ppc-atomics.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- redis-4.0.2/src/Makefile.old	2017-09-21 09:12:52.000000000 -0500
-+++ redis-4.0.2/src/Makefile	2018-05-26 18:45:23.494413590 -0500
-@@ -109,6 +109,10 @@
- # Include paths to dependencies
- FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
- 
-+ifeq ($(uname_M),ppc)
-+	FINAL_LIBS+= -latomic
-+endif
-+
- ifeq ($(MALLOC),tcmalloc)
- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
- 	FINAL_LIBS+= -ltcmalloc
diff --git a/system/redis/posix-runtest.patch b/system/redis/posix-runtest.patch
deleted file mode 100644
index 84d76ad10..000000000
--- a/system/redis/posix-runtest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- redis-4.0.2/runtest.old	2017-09-21 09:12:52.000000000 -0500
-+++ redis-4.0.2/runtest	2017-12-31 05:50:13.037119127 -0600
-@@ -3,7 +3,7 @@
- TCLSH=""
- 
- for VERSION in $TCL_VERSIONS; do
--	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
-+	TCL=`command -v tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
- done
- 
- if [ -z $TCLSH ]
---- redis-4.0.2/runtest-cluster.old	2017-09-21 09:12:52.000000000 -0500
-+++ redis-4.0.2/runtest-cluster	2017-12-31 05:50:20.517111722 -0600
-@@ -3,7 +3,7 @@
- TCLSH=""
- 
- for VERSION in $TCL_VERSIONS; do
--	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
-+	TCL=`command -v tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
- done
- 
- if [ -z $TCLSH ]
---- redis-4.0.2/runtest-sentinel.old	2017-09-21 09:12:52.000000000 -0500
-+++ redis-4.0.2/runtest-sentinel	2017-12-31 05:50:26.877105425 -0600
-@@ -3,7 +3,7 @@
- TCLSH=""
- 
- for VERSION in $TCL_VERSIONS; do
--	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
-+	TCL=`command -v tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
- done
- 
- if [ -z $TCLSH ]
diff --git a/system/redis/redis.confd b/system/redis/redis.confd
deleted file mode 100644
index a79f61ccd..000000000
--- a/system/redis/redis.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Redis user.
-REDIS_USER="redis"
-
-# Redis group.
-REDIS_GROUP="redis"
-
-# Redis configuration file.
-REDIS_CONF="/etc/redis.conf"
-
diff --git a/system/redis/redis.initd b/system/redis/redis.initd
deleted file mode 100755
index ce6aba7e3..000000000
--- a/system/redis/redis.initd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/sbin/openrc-run
-
-REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
-REDIS_USER=${REDIS_USER:-redis}
-REDIS_GROUP=${REDIS_GROUP:-redis}
-
-name="Redis server"
-command=/usr/bin/redis-server
-command_args=${REDIS_CONF}
-
-depend() {
-	use net localmount logger
-	after keepalived firewall
-}
-
-# get global pidfile, logfile, and dir from config file
-get_config() {
-	if [ ! -f "${REDIS_CONF}" ] ; then
-		eerror "You need a ${REDIS_CONF} file to run redis"
-		return 1;
-	fi
-	
-	pidfile=$(awk '$1 == "pidfile" { print $2 }' "$REDIS_CONF")
-	logfile=$(awk '$1 == "logfile" { print $2 }' "$REDIS_CONF")
-	dir=$(awk '$1 == "dir" { print $2 }' "$REDIS_CONF")
-	: ${pidfile:=/var/run/redis/redis.pid}
-	: ${logfile:=/var/log/redis/redis.log}
-	: ${dir:=/var/lib/redis}
-}
-
-start() {
-	get_config || return 1
-	checkpath -d -o ${REDIS_USER}:${REDIS_GROUP} ${pidfile%/*} \
-		${logfile%/*} ${dir}
-
-	ebegin "Starting $name"
-	start-stop-daemon --start \
-		--chdir "${dir}" \
-		--user ${REDIS_USER}:${REDIS_GROUP} \
-		--pidfile "${pidfile}" \
-		--exec "${command}" \
-		-- ${command_args}
-	eend $? 
-}
-
-stop() {
-	get_config
-	ebegin "Stopping $name"
-	start-stop-daemon --stop --retry 30 --pidfile "${pidfile}"
-	eend $?
-}
-
diff --git a/system/redis/redis.logrotate b/system/redis/redis.logrotate
deleted file mode 100644
index c77c9a0e8..000000000
--- a/system/redis/redis.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/redis/redis.log {
-   notifempty
-   missingok
-}
diff --git a/system/redis/redis.pre-install b/system/redis/redis.pre-install
deleted file mode 100644
index f73213126..000000000
--- a/system/redis/redis.pre-install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-addgroup -S redis 2>/dev/null
-adduser -S -D -H -h /var/lib/redis -s /bin/false -G redis -g redis redis 2>/dev/null
-
-exit 0