[pkg-bacula-commits] [bacula] 03/03: Without PID files, let systemd chuid() on startup again

[Sven Hartge]

This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch no-foreground-pidfile
in repository bacula.

commit 41a31b54e8f607a7f2aa5f1b754bdd317961f46d
Author: Sven Hartge <sven at svenhartge.de>
Date:   Fri Oct 27 22:24:19 2017 +0200

    Without PID files, let systemd chuid() on startup again
---
 debian/patches/non-forking-systemd-units.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/non-forking-systemd-units.patch b/debian/patches/non-forking-systemd-units.patch
index a43fc0e..5564266 100644
--- a/debian/patches/non-forking-systemd-units.patch
+++ b/debian/patches/non-forking-systemd-units.patch
@@ -38,13 +38,13 @@ Author: Sven Hartge <sven at svenhartge.de>
 -PIDFile=@piddir@/bacula-dir. at dir_port@.pid
 -ExecReload=@sbindir@/bacula-dir -t -c @sysconfdir@/bacula-dir.conf
 +Type=simple
-+User=root
-+Group=root
++User=bacula
++Group=bacula
 +Environment="CONFIG=/etc/bacula/bacula-dir.conf"
 +EnvironmentFile=-/etc/default/bacula-dir
-+ExecStartPre=@sbindir@/bacula-dir -t -u bacula -g bacula -c $CONFIG
-+ExecStart=@sbindir@/bacula-dir -f -u bacula -g bacula -c $CONFIG
-+ExecReload=@sbindir@/bacula-dir -t -u bacula -g bacula -c $CONFIG
++ExecStartPre=@sbindir@/bacula-dir -t -c $CONFIG
++ExecStart=@sbindir@/bacula-dir -f -c $CONFIG
++ExecReload=@sbindir@/bacula-dir -t -c $CONFIG
  ExecReload=/bin/kill -HUP $MAINPID
 +SuccessExitStatus=15
  StandardError=syslog
@@ -91,12 +91,12 @@ Author: Sven Hartge <sven at svenhartge.de>
 -ExecStart=@sbindir@/bacula-sd -c @sysconfdir@/bacula-sd.conf
 -PIDFile=@piddir@/bacula-sd. at sd_port@.pid
 +Type=simple
-+User=root
-+Group=root
++User=bacula
++Group=tape
 +Environment="CONFIG=/etc/bacula/bacula-sd.conf"
 +EnvironmentFile=-/etc/default/bacula-sd
-+ExecStartPre=@sbindir@/bacula-sd -t -u bacula -g tape -c $CONFIG
-+ExecStart=@sbindir@/bacula-sd -f -u bacula -g tape -c $CONFIG
++ExecStartPre=@sbindir@/bacula-sd -t -c $CONFIG
++ExecStart=@sbindir@/bacula-sd -f -c $CONFIG
 +ExecReload=/bin/kill -HUP $MAINPID
 +SuccessExitStatus=15
  StandardError=syslog

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git