- Fix rc script

- Set default config file to %%PREFIX%%/etc/bareos/bareos-[dir|sd|fd].conf
  files. Set %%PREFIX%%/etc/bareos if you want to use new config style
- Remove config file test on bareos-dir rc script. It fixed a problem on
  start/boot

PR:		218126 217141
Reported by:	Joakim Jalap <joakim.jalap at fastmail.com>
		matthias at petermann-it.de
		weberge42

6 files changed, 12 insertions, 17 deletions

diff --git a/sysutils/bareos-client-static/Makefile b/sysutils/bareos-client-static/Makefile
index ff1a8f8570c2..e51d335172b5 100644
--- a/sysutils/bareos-client-static/Makefile
+++ b/sysutils/bareos-client-static/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-#PORTREVISION=	1
+PORTREVISION=	1
 PKGNAMESUFFIX=	-client-static
 
 COMMENT=	Backup archiving recovery open sourced (static client)
diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile
index d7ce06451f26..cc2f1a19c8a6 100644
--- a/sysutils/bareos-client/Makefile
+++ b/sysutils/bareos-client/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bareos
-#PORTREVISION=	1
+PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index bfb06a885632..6ee2337750b9 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	16.2.5
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in
index a71d3a5c4e54..38a209345d4e 100644
--- a/sysutils/bareos-server/files/bareos-dir.in
+++ b/sysutils/bareos-server/files/bareos-dir.in
@@ -24,22 +24,15 @@ load_rc_config $name
 
 : ${bareos_dir_enable="NO"}
 : ${bareos_dir_flags="-u bareos -g bareos -v"}
-: ${bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.d"}
+: ${bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf"}
 : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
 
 command=%%PREFIX%%/sbin/bareos-dir
 command_args="-c ${bareos_dir_config}"
-start_precmd="bareos_dir_testconfig"
-restart_precmd="bareos_dir_testconfig"
 pidfile="${bareos_dir_pidfile}"
+start_precmd="bareos_start_precmd"
 
-bareos_dir_testconfig()
-{
-	echo Performing sanity check on bareos-dir configuration:
-	eval ${command} ${bareos_dir_flags} -t
-}
-
-start_precmd() {
+bareos_start_precmd() {
 	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
 }
 
diff --git a/sysutils/bareos-server/files/bareos-fd.in b/sysutils/bareos-server/files/bareos-fd.in
index 5bd056d48991..f979cbf2dac1 100644
--- a/sysutils/bareos-server/files/bareos-fd.in
+++ b/sysutils/bareos-server/files/bareos-fd.in
@@ -24,14 +24,15 @@ load_rc_config $name
 
 : ${bareos_fd_enable="NO"}
 : ${bareos_fd_flags="-u root -g wheel -v"}
-: ${bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.d"}
+: ${bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"}
 : ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
 
 command=%%PREFIX%%/sbin/bareos-fd
 command_args="-c ${bareos_fd_config}"
 pidfile="${bareos_fd_pidfile}"
+start_precmd="bareos_start_precmd"
 
-start_precmd() {
+bareos_start_precmd() {
 	[ -d "${pidfile%/*}" ] || {
 		getent passwd bareos > /dev/null 2&>1
 		if [ $? -eq 0] ; then
diff --git a/sysutils/bareos-server/files/bareos-sd.in b/sysutils/bareos-server/files/bareos-sd.in
index 6724f4fb5228..4793e46fc6f4 100644
--- a/sysutils/bareos-server/files/bareos-sd.in
+++ b/sysutils/bareos-server/files/bareos-sd.in
@@ -24,14 +24,15 @@ load_rc_config $name
 
 : ${bareos_sd_enable="NO"}
 : ${bareos_sd_flags="-u bareos -g bareos -v"}
-: ${bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.d"}
+: ${bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf"}
 : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
 
 command=%%PREFIX%%/sbin/bareos-sd
 command_args="-c ${bareos_sd_config}"
 pidfile="${bareos_sd_pidfile}"
+start_precmd="bareos_start_precmd"
 
-start_precmd() {
+bareos_start_precmd() {
 	[ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*}
 }