Delegate uid/gid changing to systemd. Fixes bug #1905

diff --git a/bacula/platforms/systemd/bacula-dir.service.in b/bacula/platforms/systemd/bacula-dir.service.in
index 265e92b64c39e9e649dd975e435eadb3516d20c7..9a82532e2924f74be66c86e51ea9983fd84280b1 100644 (file)
--- a/bacula/platforms/systemd/bacula-dir.service.in
+++ b/bacula/platforms/systemd/bacula-dir.service.in
@@ -26,10 +26,12 @@ ConditionPathIsDirectory=@working_dir@
 
 [Service]
 Type=forking
+User=@dir_user@
+Group=@dir_group@
 PIDFile=@piddir@/bacula-dir.@dir_port@.pid
 # EnvironmentFile=-/etc/sysconfig/bacula-dir
 StandardOutput=syslog
-ExecStart=@sbindir@/bacula-dir -u @dir_user@ -g @dir_group@ -c @sysconfdir@/bacula-dir.conf
+ExecStart=@sbindir@/bacula-dir -c @sysconfdir@/bacula-dir.conf
 # This daemon should be able to reload the conf file
 #ExecReload=/sbin/killproc -p @piddir@/bacula-dir.pid -HUP @sbindir@/bacula-dir
 

diff --git a/bacula/platforms/systemd/bacula-fd.service.in b/bacula/platforms/systemd/bacula-fd.service.in
index 8463bbd28766346481e704b4bb8da3a55719fc27..3efb25662837ce42b67b13fe3275d917b9500381 100644 (file)
--- a/bacula/platforms/systemd/bacula-fd.service.in
+++ b/bacula/platforms/systemd/bacula-fd.service.in
@@ -21,9 +21,11 @@ After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.tar
 
 [Service]
 Type=forking
+User=@fd_user@
+Group=@fd_group@
 PIDFile=@piddir@/bacula-fd.@fd_port@.pid
 StandardOutput=syslog
-ExecStart=@sbindir@/bacula-fd -u @fd_user@ -g @fd_group@ -c @sysconfdir@/bacula-fd.conf
+ExecStart=@sbindir@/bacula-fd -c @sysconfdir@/bacula-fd.conf
 
 [Install]
 WantedBy=multi-user.target

diff --git a/bacula/platforms/systemd/bacula-sd.service.in b/bacula/platforms/systemd/bacula-sd.service.in
index ba78f7f806c71fa6764b16933794b5be710d05f6..2d4dc1a5191c0fcfeff842e9ff26fc316c1e9459 100644 (file)
--- a/bacula/platforms/systemd/bacula-sd.service.in
+++ b/bacula/platforms/systemd/bacula-sd.service.in
@@ -21,10 +21,12 @@ After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.tar
 
 [Service]
 Type=forking
+User=@sd_user@
+Group=@sd_group@
 PIDFile=@piddir@/bacula-sd.@sd_port@.pid
 # EnvironmentFile=-/etc/sysconfig/bacula-sd
 StandardOutput=syslog
-ExecStart=@sbindir@/bacula-sd -u @sd_user@ -g @sd_group@ -c @sysconfdir@/bacula-sd.conf
+ExecStart=@sbindir@/bacula-sd -c @sysconfdir@/bacula-sd.conf
 
 [Install]
 WantedBy=multi-user.target