main/bacula: various improvements and small bug fixes

- use /run dir
- fix conf file permissions
- Inits:
  points bacula-sd to right conf file
  use openrc to set daemon user
  soft depends on firewall added
  cosmetic fixes

1 files changed, 6 insertions, 9 deletions

diff --git a/main/bacula/bacula-fd.initd b/main/bacula/bacula-fd.initd
index 2fff8e97875..362cf08999c 100644
--- a/main/bacula/bacula-fd.initd
+++ b/main/bacula/bacula-fd.initd
@@ -2,20 +2,17 @@
 
 : ${port:=9102}
 : ${cfgfile:=/etc/bacula/bacula-fd.conf}
-: ${exec_user:=root}
-: ${exec_group:=root}
+: ${command_user:=root}
+: ${command_group:=root}
 
 name="Bacula File Daemon"
-command="/usr/sbin/$RC_SVCNAME"
-command_args="-u $exec_user -g $exec_group -c $cfgfile"
-pidfile="/var/run/bacula/$RC_SVCNAME.$port.pid"
+command="/usr/sbin/${RC_SVCNAME}"
+command_args="-u $command_user -g $command_group -c $cfgfile"
+pidfile="/run/bacula/${RC_SVCNAME}.$port.pid"
 
 depend() {
 	need net
 	use dns
-}
-
-start_pre() {
-        checkpath -d -m 0775 -o ${exec_user}:${exec_group} /var/run/bacula
+	after firewall
 }