From 98caaa05e0a1ec72de16ada0e6c2c0a9f9307ed9 Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Wed, 8 Sep 2021 13:18:52 -1000 Subject: app-backup/bareos: systemd workaround for #631598 When using systemd. sd and dir services should not depend on the PID files, so we use bareos-sd and bareos-dir as foreground services for which systemd does not need PID files Signed-off-by: Marc Schiffbauer --- app-backup/bareos/files/bareos-dir.service | 9 ++++++--- app-backup/bareos/files/bareos-sd.service | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'app-backup') diff --git a/app-backup/bareos/files/bareos-dir.service b/app-backup/bareos/files/bareos-dir.service index a342671d0d00..f0a611715487 100644 --- a/app-backup/bareos/files/bareos-dir.service +++ b/app-backup/bareos/files/bareos-dir.service @@ -11,14 +11,17 @@ After=nss-lookup.target network.target remote-fs.target time-sync.target postgre ConditionPathIsDirectory=/var/lib/bareos [Service] -Type=forking +# see bug #631598 +#Type=forking +Type=simple User=bareos Group=bareos WorkingDirectory=/var/lib/bareos -PIDFile=/run/bareos/bareos-dir.9101.pid +#PIDFile=/run/bareos/bareos-dir.9101.pid StandardError=journal ExecStartPre=/usr/sbin/bareos-dir -t -f -ExecStart=/usr/sbin/bareos-dir +#ExecStart=/usr/sbin/bareos-dir +ExecStart=/usr/sbin/bareos-dir -f SuccessExitStatus=0 1 15 #Restart=on-failure diff --git a/app-backup/bareos/files/bareos-sd.service b/app-backup/bareos/files/bareos-sd.service index 80d9edbc9734..acf8cb0156e1 100644 --- a/app-backup/bareos/files/bareos-sd.service +++ b/app-backup/bareos/files/bareos-sd.service @@ -10,14 +10,17 @@ Requires=nss-lookup.target network.target remote-fs.target time-sync.target After=nss-lookup.target network.target remote-fs.target time-sync.target [Service] -Type=forking +# see bug #631598 +#Type=forking +Type=simple User=root Group=bareos WorkingDirectory=/var/lib/bareos -PIDFile=/run/bareos/bareos-sd.9103.pid +#PIDFile=/run/bareos/bareos-sd.9103.pid StandardError=journal ExecStartPre=/usr/sbin/bareos-sd -t -f -ExecStart=/usr/sbin/bareos-sd +#ExecStart=/usr/sbin/bareos-sd +ExecStart=/usr/sbin/bareos-sd -f # enable this for scsicrypto-sd # CapabilityBoundingSet=cap_sys_rawio+ep SuccessExitStatus=0 15 -- cgit v1.2.3-65-gdbad