Fix systemd pid files.

Signed-off-by: Marco van Wieringen <mvw@planets.elm.net>

diff --git a/bacula/platforms/systemd/bacula-dir.service.in b/bacula/platforms/systemd/bacula-dir.service.in
index 5c928c13159474706e8fde2d797a0d9ebb3fd103..265e92b64c39e9e649dd975e435eadb3516d20c7 100644 (file)
--- a/bacula/platforms/systemd/bacula-dir.service.in
+++ b/bacula/platforms/systemd/bacula-dir.service.in
@@ -26,7 +26,7 @@ ConditionPathIsDirectory=@working_dir@
 
 [Service]
 Type=forking
-PIDFile=@piddir@/bacula-dir.pid
+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

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

diff --git a/bacula/platforms/systemd/bacula-sd.service.in b/bacula/platforms/systemd/bacula-sd.service.in
index 58687dcc9aa68b908d61d8c44ea9be84f695bedf..ba78f7f806c71fa6764b16933794b5be710d05f6 100644 (file)
--- a/bacula/platforms/systemd/bacula-sd.service.in
+++ b/bacula/platforms/systemd/bacula-sd.service.in
@@ -21,7 +21,7 @@ After=var-run.mount nss-lookup.target network.target remote-fs.target syslog.tar
 
 [Service]
 Type=forking
-PIDFile=@piddir@/bacula-sd.pid
+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