testing/etcd: upgrade to 3.3.14

1 files changed, 13 insertions, 25 deletions

diff --git a/testing/etcd/etcd.initd b/testing/etcd/etcd.initd
index 14c687967c..779ab2990e 100644
--- a/testing/etcd/etcd.initd
+++ b/testing/etcd/etcd.initd
@@ -2,35 +2,23 @@
 # Copyright 2016 Alpine Linux
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
+supervisor=supervise-daemon
+
+name="$RC_SVCNAME"
+description="Highly-available key-value store"
+
+command=/usr/bin/etcd
+command_args="--config-file=$ETCD_CONFIG --data-dir=$ETCD_DATA_DIR $ETCD_OPTS"
+
+command_user="$USER:$USER"
+
+supervise_daemon_args="--chdir $ETCD_DATA_DIR"
 
 depend() {
 	need net
 }
 
 start_pre() {
-	checkpath -d -m 0775 -o $USER:$USER $PIDPATH
-	checkpath -d -m 0775 -o $USER:$USER $LOGPATH
-	checkpath -d -m 0775 -o $USER:$USER $ETCD_DATA_DIR
-}
-
-start() {
-	ebegin "Starting $SVCNAME"
-	start-stop-daemon --start \
-		--pidfile "$PIDFILE" \
-		--user $USER \
-		--chdir "$ETCD_DATA_DIR" \
-		--background \
-		--make-pidfile \
-		--exec /usr/bin/etcd -- \
-			--config-file=$ETCD_CONFIG \
-			--data-dir="$ETCD_DATA_DIR" \
-			$ETCD_OPTS
-	eend $? "Failed to start $SVCNAME"
-}
-
-stop() {
-	ebegin "Stopping $SVCNAME"
-	start-stop-daemon --stop --pidfile $PIDFILE
-	eend $? "Failed to stop $SVCNAME"
-	rm -f "$PIDFILE"
+	checkpath -d -m 0775 -o "$command_user" "$LOGPATH"
+	checkpath -d -m 0775 -o "$command_user" "$ETCD_DATA_DIR"
 }