[pkg-bacula-commits] [bacula] 17/35: Make use of /etc/default/bacula-{fd, sd, dir}
Carsten Leonhardt
leo at moszumanska.debian.org
Wed Jul 20 10:21:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
leo pushed a commit to tag development/2011-04-29
in repository bacula.
commit 3d3a23e51b8e32dc93c5b5288be61c7be3e9bbeb
Author: Jan Hauke Rahm <jhr at debian.org>
Date: Thu Apr 28 21:30:06 2011 +0200
Make use of /etc/default/bacula-{fd,sd,dir}
Such files provide three variables: $ENABLED, $ARGS, and $CONFIG.
$ENABLED can be set to 'no' to disable a service, $ARGS can contain
additional parameters passed on to the daemon, $CONFIG has a full path
to a config file (defaults to /etc/bacula/$pkg).
Closes: #555737, #530019, #530018, #530014
---
debian/bacula-director-common.bacula-director.init | 17 ++++++++++++++---
debian/bacula-director-common.install | 1 +
debian/bacula-fd.init | 17 ++++++++++++++---
debian/bacula-fd.install | 1 +
debian/bacula-sd.init | 16 +++++++++++++---
debian/bacula-sd.install | 1 +
debian/default/bacula-dir | 10 ++++++++++
debian/default/bacula-fd | 10 ++++++++++
debian/default/bacula-sd | 10 ++++++++++
9 files changed, 74 insertions(+), 9 deletions(-)
diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index 021fd87..95f9bc2 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -19,7 +19,6 @@ DAEMON=/usr/sbin/bacula-dir
NAME="bacula-dir"
PORT=9101
DESC="Bacula Director"
-ARGS="-c /etc/bacula/bacula-dir.conf -u bacula -g bacula"
test -f $DAEMON || exit 0
@@ -34,6 +33,12 @@ PIDFILE=/var/run/bacula/$NAME.$PORT.pid
. /lib/lsb/init-functions
. /usr/share/bacula-common/common-functions
+if [ -r /etc/default/bacula-dir ]; then
+ . /etc/default/bacula-dir
+fi
+
+CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
+
create_var_run_dir
get_pid()
@@ -56,7 +61,7 @@ kill_pid()
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
# do_stop()
@@ -64,7 +69,7 @@ do_stop()
{
get_pid $PIDFILE ;
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- -c $CONFIG $ARGS
# make sure daemon is stopped/killed
if [ -n "$pid" ]; then
if check_pid $pid ; then
@@ -91,6 +96,12 @@ case "$1" in
log_failure_msg "Not starting $DESC: disabled via /etc/bacula/do_not_run"
exit 0
fi
+
+ if [ "$ENABLED" = "no" ]; then
+ log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-dir"
+ exit 0
+ fi
+
create_var_run_dir
log_daemon_msg "Starting $DESC..."
if do_start ; then
diff --git a/debian/bacula-director-common.install b/debian/bacula-director-common.install
index 4e9de64..eaaa134 100644
--- a/debian/bacula-director-common.install
+++ b/debian/bacula-director-common.install
@@ -2,3 +2,4 @@ etc/bacula/scripts/query.sql
usr/sbin/bwild
usr/sbin/bregex
debian/additions/postinst-common usr/share/bacula-director
+debian/default/bacula-dir etc/default
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index 3f98ca9..fba8616 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -20,7 +20,6 @@ DAEMON=/usr/sbin/bacula-fd
NAME="bacula-fd"
PORT=9102
DESC="Bacula File daemon"
-ARGS="-c /etc/bacula/bacula-fd.conf"
test -f $DAEMON || exit 0
@@ -32,20 +31,27 @@ fi
. /lib/lsb/init-functions
. /usr/share/bacula-common/common-functions
+if [ -r /etc/default/bacula-fd ]; then
+ . /etc/default/bacula-fd
+fi
+
+CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
+
create_var_run_dir
+
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
do_stop()
{
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --exec $DAEMON -- -c $CONFIG $ARGS
}
case "$1" in
@@ -55,6 +61,11 @@ case "$1" in
exit 0
fi
+ if [ "$ENABLED" = "no" ]; then
+ log_failure_msg "Not starting $DESC: disabled via /etc/bacula/do_not_run"
+ exit 0
+ fi
+
log_daemon_msg "Starting $DESC..."
if do_start ; then
log_end_msg 0
diff --git a/debian/bacula-fd.install b/debian/bacula-fd.install
index f92725e..cf8404e 100644
--- a/debian/bacula-fd.install
+++ b/debian/bacula-fd.install
@@ -1,2 +1,3 @@
usr/sbin/bacula-fd
usr/lib/bacula/bpipe-fd.so
+debian/default/bacula-fd etc/default
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index f914645..1958924 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -18,7 +18,6 @@ DAEMON=/usr/sbin/bacula-sd
NAME="bacula-sd"
PORT=9103
DESC="Bacula Storage daemon"
-ARGS="-c /etc/bacula/bacula-sd.conf -u bacula -g tape"
test -f $DAEMON || exit 0
@@ -30,6 +29,12 @@ fi
. /lib/lsb/init-functions
. /usr/share/bacula-common/common-functions
+if [ -r /etc/default/bacula-sd ]; then
+ . /etc/default/bacula-sd
+fi
+
+CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
+
create_var_run_dir
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
@@ -37,13 +42,13 @@ PIDFILE=/var/run/bacula/$NAME.$PORT.pid
do_start()
{
start-stop-daemon --start --quiet --pidfile $PIDFILE \
- --oknodo --exec $DAEMON -- $ARGS
+ --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
}
do_stop()
{
start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON -- $ARGS
+ --exec $DAEMON -- -c $CONFIG $ARGS
}
case "$1" in
@@ -53,6 +58,11 @@ case "$1" in
exit 0
fi
+ if [ "$ENABLED" = "no" ]; then
+ log_failure_msg "Not starting $DESC: disabled via /etc/default/bacula-sd"
+ exit 0
+ fi
+
log_daemon_msg "Starting $DESC..."
if do_start ; then
log_end_msg 0
diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index b5b5ea2..8bd2078 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -5,3 +5,4 @@ etc/bacula/scripts/mtx-changer
etc/bacula/scripts/mtx-changer.conf
etc/bacula/scripts/disk-changer
etc/bacula/scripts/dvd-handler
+debian/default/bacula-sd etc/default
diff --git a/debian/default/bacula-dir b/debian/default/bacula-dir
new file mode 100644
index 0000000..23d52ed
--- /dev/null
+++ b/debian/default/bacula-dir
@@ -0,0 +1,10 @@
+# The daemon can be disabled by setting
+# ENABLED=no
+ENABLED=yes
+
+# Additional start arguments can be provided here
+ARGS="-u bacula -g bacula"
+
+# The daemon is started with a config file from /etc/bacula. To change what
+# config file to use, provide a full path to such file here
+# CONFIG=
diff --git a/debian/default/bacula-fd b/debian/default/bacula-fd
new file mode 100644
index 0000000..35341c3
--- /dev/null
+++ b/debian/default/bacula-fd
@@ -0,0 +1,10 @@
+# The daemon can be disabled by setting
+# ENABLED=no
+ENABLED=yes
+
+# Additional start arguments can be provided here
+# ARGS=
+
+# The daemon is started with a config file from /etc/bacula. To change what
+# config file to use, provide a full path to such file here
+# CONFIG=
diff --git a/debian/default/bacula-sd b/debian/default/bacula-sd
new file mode 100644
index 0000000..4b44f5c
--- /dev/null
+++ b/debian/default/bacula-sd
@@ -0,0 +1,10 @@
+# The daemon can be disabled by setting
+# ENABLED=no
+ENABLED=yes
+
+# Additional start arguments can be provided here
+ARGS="-u bacula -g tape"
+
+# The daemon is started with a config file from /etc/bacula. To change what
+# config file to use, provide a full path to such file here
+# CONFIG=
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git
More information about the pkg-bacula-commits
mailing list