From 1fdcd0b711b713aea47aec01a25872dbd94d1ab8 Mon Sep 17 00:00:00 2001
From: Joe Cheng <joe@rstudio.com>
Date: Mon, 19 Aug 2013 23:02:28 -0700
Subject: [PATCH] upstart/init.d scripts should all run as shiny user

---
 config/init.d/debian/shiny-server | 6 +++---
 config/init.d/redhat/shiny-server | 2 +-
 config/init.d/suse/shiny-server   | 2 +-
 config/upstart/shiny-server.conf  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/init.d/debian/shiny-server b/config/init.d/debian/shiny-server
index 64266840..bd18b49a 100644
--- a/config/init.d/debian/shiny-server
+++ b/config/init.d/debian/shiny-server
@@ -18,7 +18,7 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="shiny server"
 NAME=shiny-server
-DAEMON=shiny-server
+DAEMON=/usr/bin/shiny-server
 SCRIPTNAME=/etc/init.d/shiny-server
 
 # Exit if the package is not installed
@@ -40,9 +40,9 @@ do_start()
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --background --exec $DAEMON --test > /dev/null \
+	start-stop-daemon --start --quiet --background --user shiny --exec $DAEMON --test > /dev/null \
 		|| return 1
-	start-stop-daemon --start --quiet --background --exec $DAEMON \
+	start-stop-daemon --start --quiet --background --user shiny --exec $DAEMON \
 		|| return 2
 }
 
diff --git a/config/init.d/redhat/shiny-server b/config/init.d/redhat/shiny-server
index 42874fc2..f35e8e0a 100755
--- a/config/init.d/redhat/shiny-server
+++ b/config/init.d/redhat/shiny-server
@@ -21,7 +21,7 @@ fi
 start() {
     touch $logfile
     echo -n "Starting shiny-server: "
-    daemon $prog >> $logfile &
+    daemon --user shiny $prog >> $logfile &
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/config/init.d/suse/shiny-server b/config/init.d/suse/shiny-server
index 1463e32f..be5d5712 100644
--- a/config/init.d/suse/shiny-server
+++ b/config/init.d/suse/shiny-server
@@ -23,7 +23,7 @@ case "$1" in
 
 	## Start daemon with startproc(8). If this fails
 	## the return value is set appropriately by startproc.
-	/sbin/startproc shiny-server
+	/sbin/startproc -u shiny shiny-server
 
 	# Remember status and be verbose
 	rc_status -v
diff --git a/config/upstart/shiny-server.conf b/config/upstart/shiny-server.conf
index 4a02f259..e73ea540 100644
--- a/config/upstart/shiny-server.conf
+++ b/config/upstart/shiny-server.conf
@@ -7,6 +7,6 @@ stop on runlevel [016]
 
 limit nofile 1000000 1000000
 
-exec shiny-server >> /var/log/shiny-server.log 2>&1
+exec start-stop-daemon --start -c shiny --exec /usr/bin/shiny-server >> /var/log/shiny-server.log 2>&1
 
 respawn