Merge pull request #173 from robbat2/gentoo

Actually run as non-root, --user is for matching not chuid.
voxpupuli · May 15, 2015 · e9885be · e9885be
2 parents 752eec0 + 6f42348
commit e9885be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/templates/webhook.init.erb b/templates/webhook.init.erb
@@ -31,7 +31,7 @@ start() {
     echo
     echo -n $"Starting webhook: "
     <% if @osfamily == 'Debian' -%>
-    start-stop-daemon --start --user ${DAEMON_USER:?} <%= scope.lookupvar('r10k::params::start_pidfile_args') %> --startas=$webhook
+    start-stop-daemon --start --chuid ${DAEMON_USER} --user ${DAEMON_USER:?} <%= scope.lookupvar('r10k::params::start_pidfile_args') %> --startas=$webhook
     <% else -%>
     daemon --user ${DAEMON_USER:?} <%= scope.lookupvar('r10k::params::start_pidfile_args') %> $webhook
     <% end -%>

diff --git a/templates/webhook.init.gentoo.erb b/templates/webhook.init.gentoo.erb
@@ -13,6 +13,7 @@ WEBHOOK_BIN=${WEBHOOK_BIN:=/usr/local/bin/webhook}
 command=${WEBHOOK_BIN}
 pidfile=${WEBHOOK_PIDFILE}
 start_stop_daemon_args="--pidfile ${pidfile} \
+  --chuid ${WEBHOOK_USER} \
   --user ${WEBHOOK_USER} \
   --name ${command}"