From nobody Fri Jul 05 14:53:30 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WFxNB4C4Yz5Ps6q; Fri, 05 Jul 2024 14:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFxNB3ssXz4DlF; Fri, 5 Jul 2024 14:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720191210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+NjzYweW1lrpoNRUlJyzVr8I4DNUB01FVHJqTULFZM=; b=wjRqQJmBNgqvFYwn0JlxDvXy/IIkiweDVaV5qDZPrtvcEqb8AFyOehaKkdduQA6AQzdJ8D 5NZV9ro6ud2zj+l1OscYvIjE9X9BqR4h/ChVTweaDigq6RIKCBByaBfOsj7RndnQqSUljH Pr8AWLPc3l8QATgBvJiDdwP/D3H0AGDDvTFE1i65Ni7UXBoJ3BDlcTGkExa4bIN79EjrmR a3kHICr4aybaUYv+xQ90uHcnHxeJ6zoRE19IgGIwtl4h7T+1eSZQPqJfFDAnTiCtCTdYv2 kWbki0txIrRQ0aFg4bjZ2KvYNmxLWcespVnoz+FxW/SgERlh55c/xm/KnBvR8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720191210; a=rsa-sha256; cv=none; b=gg2fqfM3y3OZ+tInOAzXHvn/xOIPH7OWH71nCsZNyGKLpArCirtColZ+pnUAG9By8bD2Fi 1UkS/qh3Nhd06INAmHpa3TRLZC5RkwIqq5swWm63kgAhPiJCfeLuP9Vhx8Z0kRYlC1oDDP UYOjOoCl9tmtWEuVgSxRywlO6ONjZohvEh/ggi6PJZ1Ti8ynaoIHINzzPxJ/CfOYNQa2rZ I26RYKAxrXmoitLsb4vOCTGX8PWFdrswYqtN5G6F3y14eeA6GBVnsItb6octNvBvUQLf/9 tuNJdb0x/I8p0Tti+pcioCtfK1B/oxdfClgFKljKDT/LbhPmwYpUd4UPewpxxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720191210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+NjzYweW1lrpoNRUlJyzVr8I4DNUB01FVHJqTULFZM=; b=H+kcGgFVH+tOgsiEQ49OKxq4RJhlWC1sAuk4zJhh+m28NNCdu+7rSWv7j2IlevkseVfhBV l0gorlWIhWdQNZ6tvFXtcmtoEIXpja8n1sFOFlpjjMzKRzNlATeXDOrjTaSEFhJCHDVqV+ SH86ZWS84itDvrdhbzMkCZk3KoI8bPG6EFFEjB+78o70aU6fC6Kq9ij/yXCaRBiwwCs0sU TlvdN5Lhjp7Vvr0Sh+iTzEeRXctv9y3U4iVZAjC8ABW0CxJvASG9vP3qLz5lLIxj6JUQzE DL4olPTgZr6GYJZqog+OvYxmpA2OX+vu2cGEZm7GjJJ/DTILNEAZILMikgDelw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WFxNB3S5Zz11bl; Fri, 5 Jul 2024 14:53:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 465ErUEc063780; Fri, 5 Jul 2024 14:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 465ErUJP063777; Fri, 5 Jul 2024 14:53:30 GMT (envelope-from git) Date: Fri, 5 Jul 2024 14:53:30 GMT Message-Id: <202407051453.465ErUJP063777@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 8636c2e7142e - main - sysutils/bacula*-{client,server}: fix rc script names List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8636c2e7142ea93b5c23609c5f06f4e52aa0ad31 Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=8636c2e7142ea93b5c23609c5f06f4e52aa0ad31 commit 8636c2e7142ea93b5c23609c5f06f4e52aa0ad31 Author: Dan Langille AuthorDate: 2024-07-05 14:34:34 +0000 Commit: Dan Langille CommitDate: 2024-07-05 14:36:51 +0000 sysutils/bacula*-{client,server}: fix rc script names The filenames now comply with the rc scripting recommendations and service jails options. Users may have to update any personal scripts they have which depend upon those rc.d script names. See UPDATING for 20240705 PR: 280137 --- UPDATING | 17 +++++++++++++++++ sysutils/bacula11-client/Makefile | 2 +- sysutils/bacula11-server/Makefile | 4 ++-- .../files/{bacula-dir.in => bacula_dir.in} | 1 + .../bacula-fd.in => bacula11-server/files/bacula_fd.in} | 1 + .../bacula-sd.in => bacula11-server/files/bacula_sd.in} | 1 + sysutils/bacula13-client/Makefile | 2 +- sysutils/bacula13-server/Makefile | 4 ++-- .../files/bacula_dir.in} | 1 + .../bacula-fd.in => bacula13-server/files/bacula_fd.in} | 1 + .../bacula-sd.in => bacula13-server/files/bacula_sd.in} | 1 + sysutils/bacula15-client/Makefile | 2 +- sysutils/bacula15-server/Makefile | 4 ++-- .../files/bacula_dir.in} | 1 + .../files/{bacula-fd.in => bacula_fd.in} | 1 + .../bacula-sd.in => bacula15-server/files/bacula_sd.in} | 1 + sysutils/bacula9-client/Makefile | 2 +- sysutils/bacula9-server/Makefile | 2 +- .../files/bacula_dir.in} | 1 + .../bacula9-server/files/{bacula-fd.in => bacula_fd.in} | 1 + .../bacula-sd.in => bacula9-server/files/bacula_sd.in} | 1 + 21 files changed, 40 insertions(+), 11 deletions(-) diff --git a/UPDATING b/UPDATING index 6f7d93fd1511..d1084784becd 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,23 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20240705: + AFFECTS: sysutils/bacula*-{client,server} + AUTHOR: netchildFreeBSD.org + + The start scripts of bacula have been renamed to bacula_fd, bacula_dir and + bacula_sd for improved compatibility with other parts of the + system. The automatic start at boot (rc.conf variable settings) is + not affected, but if you have some other automatism you may want to + change + ".../etc/rc.d/bacula-fd" to ".../etc/rc.d/bacula_fd" + ".../etc/rc.d/bacula-dir" to ".../etc/rc.d/bacula_dir" + ".../etc/rc.d/bacula-sd" to ".../etc/rc.d/bacula_sd" + or + "service bacula-fd ..." to "service bacula_fd ..." + "service bacula-dir ..." to "service bacula_dir ..." + "service bacula-sd ..." to "service bacula_sd ..." + 20240704: AFFECTS: net/xrdp and x11-drivers/xorgxrdp AUTHOR: meta@FreeBSD.org diff --git a/sysutils/bacula11-client/Makefile b/sysutils/bacula11-client/Makefile index 97462c95486c..e8b90db69870 100644 --- a/sysutils/bacula11-client/Makefile +++ b/sysutils/bacula11-client/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= 11-client COMMENT= Network backup solution (client) WITH_CLIENT_ONLY=yes -USE_RC_SUBR= bacula-fd +USE_RC_SUBR= bacula_fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bacula11-server diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 39eb9172f0d7..6da9df02a514 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 11.0.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -51,7 +51,7 @@ OPTIONS_SUB= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbac-${PORTVERSION}.so:sysutils/bacula11-client -USE_RC_SUBR?= bacula-dir bacula-sd +USE_RC_SUBR?= bacula_dir bacula_sd .endif .if defined(WITH_CLIENT_ONLY) diff --git a/sysutils/bacula11-server/files/bacula-dir.in b/sysutils/bacula11-server/files/bacula_dir.in similarity index 94% rename from sysutils/bacula11-server/files/bacula-dir.in rename to sysutils/bacula11-server/files/bacula_dir.in index 1825c924306e..57e9fa84df5a 100644 --- a/sysutils/bacula11-server/files/bacula-dir.in +++ b/sysutils/bacula11-server/files/bacula_dir.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_dir_enable="NO"} : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"} : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"} +: ${bacula_dir_svcj_options:="net_basic"} pidfile="${bacula_dir_pidfile}" diff --git a/sysutils/bacula13-server/files/bacula-fd.in b/sysutils/bacula11-server/files/bacula_fd.in similarity index 94% rename from sysutils/bacula13-server/files/bacula-fd.in rename to sysutils/bacula11-server/files/bacula_fd.in index d011131d8790..e2bd10a4aa0b 100644 --- a/sysutils/bacula13-server/files/bacula-fd.in +++ b/sysutils/bacula11-server/files/bacula_fd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_fd_enable="NO"} : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"} : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"} +: ${bacula_fd_svcj_options:="net_basic"} pidfile="${bacula_fd_pidfile}" diff --git a/sysutils/bacula15-server/files/bacula-sd.in b/sysutils/bacula11-server/files/bacula_sd.in similarity index 94% rename from sysutils/bacula15-server/files/bacula-sd.in rename to sysutils/bacula11-server/files/bacula_sd.in index 2020f846f1c7..664d896fabe4 100644 --- a/sysutils/bacula15-server/files/bacula-sd.in +++ b/sysutils/bacula11-server/files/bacula_sd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_sd_enable="NO"} : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"} : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"} +: ${bacula_sd_svcj_options:="net_basic"} pidfile="${bacula_sd_pidfile}" diff --git a/sysutils/bacula13-client/Makefile b/sysutils/bacula13-client/Makefile index 7d0dcbfc28f3..f05ee0077bbc 100644 --- a/sysutils/bacula13-client/Makefile +++ b/sysutils/bacula13-client/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= 13-client COMMENT= Network backup solution (client) WITH_CLIENT_ONLY=yes -USE_RC_SUBR= bacula-fd +USE_RC_SUBR= bacula_fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bacula13-server diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index 8d9021c02eee..d1a20dd88e89 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula DISTVERSION= 13.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -48,7 +48,7 @@ OPTIONS_SUB= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbac-${PORTVERSION}.so:sysutils/bacula13-client -USE_RC_SUBR?= bacula-dir bacula-sd +USE_RC_SUBR?= bacula_dir bacula_sd .endif .if defined(WITH_CLIENT_ONLY) diff --git a/sysutils/bacula15-server/files/bacula-dir.in b/sysutils/bacula13-server/files/bacula_dir.in similarity index 94% rename from sysutils/bacula15-server/files/bacula-dir.in rename to sysutils/bacula13-server/files/bacula_dir.in index 1825c924306e..57e9fa84df5a 100644 --- a/sysutils/bacula15-server/files/bacula-dir.in +++ b/sysutils/bacula13-server/files/bacula_dir.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_dir_enable="NO"} : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"} : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"} +: ${bacula_dir_svcj_options:="net_basic"} pidfile="${bacula_dir_pidfile}" diff --git a/sysutils/bacula11-server/files/bacula-fd.in b/sysutils/bacula13-server/files/bacula_fd.in similarity index 94% rename from sysutils/bacula11-server/files/bacula-fd.in rename to sysutils/bacula13-server/files/bacula_fd.in index d011131d8790..e2bd10a4aa0b 100644 --- a/sysutils/bacula11-server/files/bacula-fd.in +++ b/sysutils/bacula13-server/files/bacula_fd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_fd_enable="NO"} : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"} : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"} +: ${bacula_fd_svcj_options:="net_basic"} pidfile="${bacula_fd_pidfile}" diff --git a/sysutils/bacula9-server/files/bacula-sd.in b/sysutils/bacula13-server/files/bacula_sd.in similarity index 94% rename from sysutils/bacula9-server/files/bacula-sd.in rename to sysutils/bacula13-server/files/bacula_sd.in index 2020f846f1c7..664d896fabe4 100644 --- a/sysutils/bacula9-server/files/bacula-sd.in +++ b/sysutils/bacula13-server/files/bacula_sd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_sd_enable="NO"} : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"} : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"} +: ${bacula_sd_svcj_options:="net_basic"} pidfile="${bacula_sd_pidfile}" diff --git a/sysutils/bacula15-client/Makefile b/sysutils/bacula15-client/Makefile index 96d818343a83..a6bd146e1ab3 100644 --- a/sysutils/bacula15-client/Makefile +++ b/sysutils/bacula15-client/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= 15-client COMMENT= Network backup solution (client) WITH_CLIENT_ONLY=yes -USE_RC_SUBR= bacula-fd +USE_RC_SUBR= bacula_fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bacula15-server diff --git a/sysutils/bacula15-server/Makefile b/sysutils/bacula15-server/Makefile index 33848b9db168..10c7bef762aa 100644 --- a/sysutils/bacula15-server/Makefile +++ b/sysutils/bacula15-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula DISTVERSION= 15.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${DISTVERSION} PKGNAMEPREFIX?= # @@ -50,7 +50,7 @@ OPTIONS_SUB= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbac-${LIB_VERSION}.so:sysutils/bacula15-client -USE_RC_SUBR?= bacula-dir bacula-sd +USE_RC_SUBR?= bacula_dir bacula_sd .endif .if defined(WITH_CLIENT_ONLY) diff --git a/sysutils/bacula9-server/files/bacula-dir.in b/sysutils/bacula15-server/files/bacula_dir.in similarity index 94% rename from sysutils/bacula9-server/files/bacula-dir.in rename to sysutils/bacula15-server/files/bacula_dir.in index 1825c924306e..57e9fa84df5a 100644 --- a/sysutils/bacula9-server/files/bacula-dir.in +++ b/sysutils/bacula15-server/files/bacula_dir.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_dir_enable="NO"} : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"} : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"} +: ${bacula_dir_svcj_options:="net_basic"} pidfile="${bacula_dir_pidfile}" diff --git a/sysutils/bacula15-server/files/bacula-fd.in b/sysutils/bacula15-server/files/bacula_fd.in similarity index 94% rename from sysutils/bacula15-server/files/bacula-fd.in rename to sysutils/bacula15-server/files/bacula_fd.in index d011131d8790..e2bd10a4aa0b 100644 --- a/sysutils/bacula15-server/files/bacula-fd.in +++ b/sysutils/bacula15-server/files/bacula_fd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_fd_enable="NO"} : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"} : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"} +: ${bacula_fd_svcj_options:="net_basic"} pidfile="${bacula_fd_pidfile}" diff --git a/sysutils/bacula11-server/files/bacula-sd.in b/sysutils/bacula15-server/files/bacula_sd.in similarity index 94% rename from sysutils/bacula11-server/files/bacula-sd.in rename to sysutils/bacula15-server/files/bacula_sd.in index 2020f846f1c7..664d896fabe4 100644 --- a/sysutils/bacula11-server/files/bacula-sd.in +++ b/sysutils/bacula15-server/files/bacula_sd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_sd_enable="NO"} : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"} : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"} +: ${bacula_sd_svcj_options:="net_basic"} pidfile="${bacula_sd_pidfile}" diff --git a/sysutils/bacula9-client/Makefile b/sysutils/bacula9-client/Makefile index 57ae8f72a757..19359d0fea42 100644 --- a/sysutils/bacula9-client/Makefile +++ b/sysutils/bacula9-client/Makefile @@ -7,7 +7,7 @@ BROKEN_aarch64= Fails to link: missing sbrk BROKEN_riscv64= Fails to link: missing sbrk WITH_CLIENT_ONLY=yes -USE_RC_SUBR= bacula-fd +USE_RC_SUBR= bacula_fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bacula9-server diff --git a/sysutils/bacula9-server/Makefile b/sysutils/bacula9-server/Makefile index 54374793f41f..3669940a6ecc 100644 --- a/sysutils/bacula9-server/Makefile +++ b/sysutils/bacula9-server/Makefile @@ -50,7 +50,7 @@ OPTIONS_SUB= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbac-${PORTVERSION}.so:sysutils/bacula9-client -USE_RC_SUBR?= bacula-dir bacula-sd +USE_RC_SUBR?= bacula_dir bacula_sd .endif .if defined(WITH_CLIENT_ONLY) diff --git a/sysutils/bacula13-server/files/bacula-dir.in b/sysutils/bacula9-server/files/bacula_dir.in similarity index 94% rename from sysutils/bacula13-server/files/bacula-dir.in rename to sysutils/bacula9-server/files/bacula_dir.in index 1825c924306e..57e9fa84df5a 100644 --- a/sysutils/bacula13-server/files/bacula-dir.in +++ b/sysutils/bacula9-server/files/bacula_dir.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_dir_enable="NO"} : ${bacula_dir_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-dir.conf"} : ${bacula_dir_pidfile="/var/run/bacula-dir.9101.pid"} +: ${bacula_dir_svcj_options:="net_basic"} pidfile="${bacula_dir_pidfile}" diff --git a/sysutils/bacula9-server/files/bacula-fd.in b/sysutils/bacula9-server/files/bacula_fd.in similarity index 94% rename from sysutils/bacula9-server/files/bacula-fd.in rename to sysutils/bacula9-server/files/bacula_fd.in index d011131d8790..e2bd10a4aa0b 100644 --- a/sysutils/bacula9-server/files/bacula-fd.in +++ b/sysutils/bacula9-server/files/bacula_fd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_fd_enable="NO"} : ${bacula_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bacula/bacula-fd.conf"} : ${bacula_fd_pidfile="/var/run/bacula-fd.9102.pid"} +: ${bacula_fd_svcj_options:="net_basic"} pidfile="${bacula_fd_pidfile}" diff --git a/sysutils/bacula13-server/files/bacula-sd.in b/sysutils/bacula9-server/files/bacula_sd.in similarity index 94% rename from sysutils/bacula13-server/files/bacula-sd.in rename to sysutils/bacula9-server/files/bacula_sd.in index 2020f846f1c7..664d896fabe4 100644 --- a/sysutils/bacula13-server/files/bacula-sd.in +++ b/sysutils/bacula9-server/files/bacula_sd.in @@ -23,6 +23,7 @@ load_rc_config $name : ${bacula_sd_enable="NO"} : ${bacula_sd_flags=" -u bacula -g bacula -v -c %%PREFIX%%/etc/bacula/bacula-sd.conf"} : ${bacula_sd_pidfile="/var/run/bacula-sd.9103.pid"} +: ${bacula_sd_svcj_options:="net_basic"} pidfile="${bacula_sd_pidfile}"