Date: Fri, 21 Apr 2017 17:47:38 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439102 - in head/sysutils: bareos-client bareos-client-static bareos-server bareos-server/files Message-ID: <201704211747.v3LHlcpD015498@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Fri Apr 21 17:47:38 2017 New Revision: 439102 URL: https://svnweb.freebsd.org/changeset/ports/439102 Log: - 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 Modified: head/sysutils/bareos-client-static/Makefile head/sysutils/bareos-client/Makefile head/sysutils/bareos-server/Makefile head/sysutils/bareos-server/files/bareos-dir.in head/sysutils/bareos-server/files/bareos-fd.in head/sysutils/bareos-server/files/bareos-sd.in Modified: head/sysutils/bareos-client-static/Makefile ============================================================================== --- head/sysutils/bareos-client-static/Makefile Fri Apr 21 17:20:07 2017 (r439101) +++ head/sysutils/bareos-client-static/Makefile Fri Apr 21 17:47:38 2017 (r439102) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -#PORTREVISION= 1 +PORTREVISION= 1 PKGNAMESUFFIX= -client-static COMMENT= Backup archiving recovery open sourced (static client) Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Fri Apr 21 17:20:07 2017 (r439101) +++ head/sysutils/bareos-client/Makefile Fri Apr 21 17:47:38 2017 (r439102) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bareos -#PORTREVISION= 1 +PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Fri Apr 21 17:20:07 2017 (r439101) +++ head/sysutils/bareos-server/Makefile Fri Apr 21 17:47:38 2017 (r439102) @@ -4,7 +4,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 16.2.5 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server Modified: head/sysutils/bareos-server/files/bareos-dir.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-dir.in Fri Apr 21 17:20:07 2017 (r439101) +++ head/sysutils/bareos-server/files/bareos-dir.in Fri Apr 21 17:47:38 2017 (r439102) @@ -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%/*} } Modified: head/sysutils/bareos-server/files/bareos-fd.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-fd.in Fri Apr 21 17:20:07 2017 (r439101) +++ head/sysutils/bareos-server/files/bareos-fd.in Fri Apr 21 17:47:38 2017 (r439102) @@ -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 Modified: head/sysutils/bareos-server/files/bareos-sd.in ============================================================================== --- head/sysutils/bareos-server/files/bareos-sd.in Fri Apr 21 17:20:07 2017 (r439101) +++ head/sysutils/bareos-server/files/bareos-sd.in Fri Apr 21 17:47:38 2017 (r439102) @@ -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%/*} }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704211747.v3LHlcpD015498>