Attachment 174296 Details for Bug 212282 – bareos-server-rc.patch

[patch] bareos-server-rc.patch

bareos-server-rc.patch (text/plain), 3.94 KB, created by O. Hartmann on 2016-09-01 19:12:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: O. Hartmann

Created: 2016-09-01 19:12:26 UTC

Size: 3.94 KB

patch

obsolete

>Index: bareos-server/files/bareos-dir.in
>===================================================================
>--- bareos-server/files/bareos-dir.in	(revision 421241)
>+++ bareos-server/files/bareos-dir.in	(working copy)
>@@ -11,6 +11,8 @@
> #
> # bareos_dir_enable  (bool):   Set to NO by default.
> #                Set it to YES to enable bareos_dir.
>+# bareos_dir_configfile (foo/bar/file.conf): absolute path to bareos-dir
>+#		configuration file
> # bareos_dir_flags (params):   Set params used to start bareos_dir.
> #
> 
>@@ -19,13 +21,26 @@
> name="bareos_dir"
> rcvar=${name}_enable
> command=%%PREFIX%%/sbin/bareos-dir
>+bareos_dir_user="bareos"
>+bareos_dir_group="bareos"
>+bareos_dir_configfile="%%PREFIX%%/etc/bareos/bareos-dir.conf"
>+start_precmd=${name}_prestart
> 
> load_rc_config $name
> 
> : ${bareos_dir_enable="NO"}
>-: ${bareos_dir_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-dir.conf"}
>+: ${bareos_dir_flags=" -u ${bareos_dir_user} -g ${bareos_dir_group} -v -c ${bareos_dir_configfile}"}
> : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"}
> 
> pidfile="${bareos_dir_pidfile}"
> 
>+required_files=${bareos_dir_configfile}
>+required_dirs=${pidfile%/*}
>+
>+bareos_dir_prestart()
>+{
>+	[ -d "${pidfile%/*}" ] || install -d -o ${bareos_dir_user} -g ${bareos_dir_group} ${pidfile%/*}
>+}
>+
>+
> run_rc_command "$1"
>Index: bareos-server/files/bareos-fd.in
>===================================================================
>--- bareos-server/files/bareos-fd.in	(revision 421241)
>+++ bareos-server/files/bareos-fd.in	(working copy)
>@@ -11,6 +11,8 @@
> #
> # bareos_fd_enable  (bool):  Set to NO by default.
> #               Set it to YES to enable bareos_fd.
>+# bareos_sd_configfile (foo/bar/file.conf): absolute path to bareos-fd 
>+#               configuration file
> # bareos_fd_flags (params):  Set params used to start bareos_fd.
> #
> 
>@@ -19,13 +21,27 @@
> name="bareos_fd"
> rcvar=${name}_enable
> command=%%PREFIX%%/sbin/bareos-fd
>+bareos_fd_user="root"
>+bareos_fd_group="wheel"
>+bareos_user="bareos"
>+bareos_group="bareos"
>+bareos_fd_configfile="%%PREFIX%%/etc/bareos/bareos-fd.conf"
>+start_precmd=${name}_prestart
> 
> load_rc_config $name
> 
> : ${bareos_fd_enable="NO"}
>-: ${bareos_fd_flags=" -u root -g wheel -v -c %%PREFIX%%/etc/bareos/bareos-fd.conf"}
>+: ${bareos_fd_flags=" -u ${bareos_fd_user} -g ${bareos_fd_group} -v -c ${bareos_fd_configfile}"}
> : ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"}
> 
> pidfile="${bareos_fd_pidfile}"
> 
>+required_files=${bareos_fd_configfile}
>+required_dirs=${pidfile%/*}
>+
>+bareos_fd_prestart()
>+{
>+        [ -d "${pidfile%/*}" ] || install -d -o ${bareos_user} -g {bareos_group} ${pidfile%/*}
>+}
>+
> run_rc_command "$1"
>Index: bareos-server/files/bareos-sd.in
>===================================================================
>--- bareos-server/files/bareos-sd.in	(revision 421241)
>+++ bareos-server/files/bareos-sd.in	(working copy)
>@@ -11,6 +11,8 @@
> #
> # bareos_sd_enable  (bool):  Set to NO by default.
> #               Set it to YES to enable bareos_sd.
>+# bareos_sd_configfile (foo/bar/file.conf): absolute path to bareos-sd
>+#               configuration file
> # bareos_sd_flags (params):  Set params used to start bareos_sd.
> #
> 
>@@ -19,13 +21,25 @@
> name="bareos_sd"
> rcvar=${name}_enable
> command=%%PREFIX%%/sbin/bareos-sd
>+bareos_sd_user="bareos"
>+bareos_sd_group="bareos"
>+bareos_sd_configfile="%%PREFIX%%/etc/bareos/bareos-sd.conf"
>+start_precmd=${name}_prestart
> 
> load_rc_config $name
> 
> : ${bareos_sd_enable="NO"}
>-: ${bareos_sd_flags=" -u bareos -g bareos -v -c %%PREFIX%%/etc/bareos/bareos-sd.conf"}
>+: ${bareos_sd_flags=" -u ${bareos_sd_user} -g ${bareos_sd_group} -v -c ${bareos_sd_configfile}"}
> : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"}
> 
>-pidfile="${bacula_sd_pidfile}"
>+pidfile="${bareos_sd_pidfile}"
> 
>+required_files=${bareos_sd_configfile}
>+required_dirs=${pidfile%/*}
>+
>+bareos_sd_prestart()
>+{
>+       	[ -d "${pidfile%/*}" ] || install -d -o ${bareos_sd_user} -g ${bareos_sd_group} ${pidfile%/*}
>+}
>+
> run_rc_command "$1"

Actions: View | Diff

Attachments on bug 212282: 174252 | 174279 | 174296 | 177087