init/elivepatch.init: added daemon_group option

Alice Ferrazzi · Alice Ferrazzi · commit e580a063134d · 2017-08-29T05:34:45.000+09:00
diff --git a/init/elivepatch.confd b/init/elivepatch.confd
@@ -1,2 +1,3 @@
 # /etc/conf.d/elivepatch
-DAEMON_USER=root:root
+DAEMON_USER=root
+DAEMON_GROUP=root
diff --git a/init/elivepatch.init b/init/elivepatch.init
@@ -10,12 +10,12 @@ PIDFILE=/var/run/${DAEMON_NAME}.pid
 
 start () {
     ebegin "Starting system ${DAEMON_NAME} daemon"
-    start-stop-daemon --start --background --pidfile ${PIDFILE} --user ${DAEMON_USER} --make-pidfile --exec ${DAEMON} runserver
+    start-stop-daemon --start --background --pidfile ${PIDFILE} --user ${DAEMON_USER}:${DAEMON_GROUP} --make-pidfile --exec ${DAEMON} runserver
     eend $? "Failed to start ${DAEMON_NAME}"
 }
 
 stop () {
     ebegin "Stopping system ${DAEMON_NAME} daemon"
-    start-stop-daemon --stop --pidfile ${PIDFILE} --user ${DAEMON_USER} --retry 10
+    start-stop-daemon --stop --pidfile ${PIDFILE} --user ${DAEMON_USER}:${DAEMON_GROUP} --retry 10
     eend $? "Failed to stop ${DAEMON_NAME}"
 }

Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ PIDFILE=/var/run/${DAEMON_NAME}.pid`
`10`	`10`
`11`	`11`	`start () {`
`12`	`12`	`ebegin "Starting system ${DAEMON_NAME} daemon"`
`13`		`- start-stop-daemon --start --background --pidfile ${PIDFILE} --user ${DAEMON_USER} --make-pidfile --exec ${DAEMON} runserver`
	`13`	`+ start-stop-daemon --start --background --pidfile ${PIDFILE} --user ${DAEMON_USER}:${DAEMON_GROUP} --make-pidfile --exec ${DAEMON} runserver`
`14`	`14`	`eend $? "Failed to start ${DAEMON_NAME}"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`stop () {`
`18`	`18`	`ebegin "Stopping system ${DAEMON_NAME} daemon"`
`19`		`- start-stop-daemon --stop --pidfile ${PIDFILE} --user ${DAEMON_USER} --retry 10`
	`19`	`+ start-stop-daemon --stop --pidfile ${PIDFILE} --user ${DAEMON_USER}:${DAEMON_GROUP} --retry 10`
`20`	`20`	`eend $? "Failed to stop ${DAEMON_NAME}"`
`21`	`21`	`}`