[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-62-g1c18684
Alexander Golovko
alexandro at ankalagon.ru
Mon May 21 12:46:54 UTC 2012
The following commit has been merged in the master branch:
commit 1c18684be24bba3fc425d4f4ad2c5ad8ffa4c136
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Mon May 21 01:09:31 2012 +0400
Rework /etc/default/* files generation
Move postinst scripts common functions from common-functions to
common-functions.dpkg
Move init scripts common functions from common-functions to
common-functions.init
Add to common-functions.dpkg code for processing /etc/default/
creating, preserving changes on upgrades, migrating from
/etc/bacula/do_not_run
Process /etc/default in postinst and postrm scripts
Remove from init-scripts /etc/bacula/do_not_run usage, due to migrating
this functionality into /etc/default
Remove unused default/ directory, due to file in it generated on-fly
Add depends from ucf
diff --git a/debian/additions/common-functions.dpkg b/debian/additions/common-functions.dpkg
new file mode 100644
index 0000000..dd80ed3
--- /dev/null
+++ b/debian/additions/common-functions.dpkg
@@ -0,0 +1,131 @@
+#
+# Common functions, used from dpkg scripts
+#
+
+genRandomPassword()
+{
+ cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c33
+}
+
+readOrCreatePasswords()
+{
+ BACULAPWFILE=/etc/bacula/common_default_passwords
+ if [ -f $BACULAPWFILE ]; then
+ . $BACULAPWFILE
+ fi
+
+ if [ -z "$DIRPASSWD" -o -z "$DIRMPASSWD" -o -z "$SDPASSWD" -o \
+ -z "$SDMPASSWD" -o -z "$FDPASSWD" -o -z "$FDMPASSWD" ] ; then
+ # Create the passwords.
+ DIRPASSWD=`genRandomPassword`
+ DIRMPASSWD=`genRandomPassword`
+ SDPASSWD=`genRandomPassword`
+ SDMPASSWD=`genRandomPassword`
+ FDPASSWD=`genRandomPassword`
+ FDMPASSWD=`genRandomPassword`
+
+ # Save the passwords.
+ echo "# " > $BACULAPWFILE
+ chown root:root $BACULAPWFILE
+ chmod 0600 $BACULAPWFILE
+ cat >>$BACULAPWFILE <<EOF
+# This file holds defaults for new Bacula packages installed on this system.
+# It is used only when you install a new Bacula package, and can be
+# safely removed at any time.
+
+DIRPASSWD=$DIRPASSWD
+DIRMPASSWD=$DIRMPASSWD
+SDPASSWD=$SDPASSWD
+SDMPASSWD=$SDMPASSWD
+FDPASSWD=$FDPASSWD
+FDMPASSWD=$FDMPASSWD
+EOF
+ fi
+}
+
+
+#
+# Function for setup /etc/default/*
+# Usage: call from postins script "setup_etc_default <package> $@"
+#
+# if there is fresh install, generate default /etc/default/* file
+# if there is upgrade from old version, then set ENABLED=no if /etc/bacula/do_not_run present
+# if there is upgrade from recent version, then preserve ENABLED, ARGS and CONFIG variables/
+#
+setup_etc_default() {
+ local PACKAGE SERVICE ARGS DEFAULT_ARGS ENABLED CONFIG DEFAULTS tempfile
+ PACKAGE="$1"
+
+ if [ "$2" != "configure" ]; then
+ return
+ fi
+
+ case "$1" in
+ bacula-fd)
+ SERVICE="bacula-fd"
+ ARGS=""
+ DEFAULT_ARGS=""
+ ;;
+ bacula-sd)
+ SERVICE="bacula-sd"
+ ARGS="-u bacula -g tape"
+ DEFAULT_ARGS="-u bacula -g tape"
+ ;;
+ bacula-director-pgsql|bacula-director-mysql|bacula-director-sqlite3)
+ SERVICE="bacula-dir"
+ ARGS="-u bacula -g bacula"
+ DEFAULT_ARGS="-u bacula -g bacula"
+ ;;
+ *)
+ echo "setup_defaults: unknown package \"$1\"" >&2
+ return
+ esac
+
+
+ ENABLED="yes"
+ CONFIG="/etc/bacula/$SERVICE.conf"
+ DEFAULTS="/etc/default/$SERVICE"
+
+
+ if [ -n "$3" ]; then
+ if dpkg --compare-versions "$3" lt "5.0.3+dfsgreal-1"; then
+ if [ -f "/etc/bacula/do_not_run" ]; then
+ ENABLED="no"
+ fi
+ else
+ if [ -f "$DEFAULTS" ]; then
+ ENABLED=$(. $DEFAULTS; echo $ENABLED)
+ ARGS=$(. $DEFAULTS; echo $ARGS)
+ CONFIG=$(. $DEFAULTS; echo $CONFIG)
+ fi
+ fi
+ fi
+
+
+ #db_get "$PACKAGE/disable-service"
+ #if [ "$RET" = "true" ]; then
+ # ENABLED="no"
+ #fi
+
+
+ tempfile=`tempfile`
+ cat >"$tempfile" <<_EOF
+# defaults file for $SERVICE
+
+# Service can be disabled by setting
+# ENABLED="no"
+ENABLED="$ENABLED"
+
+# Additional start arguments can be provided here
+# ARGS="$DEFAULT_ARGS"
+ARGS="$ARGS"
+
+# Default config file can be changed here
+# CONFIG="/etc/bacula/$SERVICE.conf"
+CONFIG="$CONFIG"
+_EOF
+
+ ucf --debconf-ok "$tempfile" "$DEFAULTS"
+ ucfr "$PACKAGE" "$DEFAULTS"
+ rm -f "$tempfile"
+}
diff --git a/debian/additions/common-functions.init b/debian/additions/common-functions.init
new file mode 100644
index 0000000..f2b7f00
--- /dev/null
+++ b/debian/additions/common-functions.init
@@ -0,0 +1,11 @@
+#
+# Common functions, used from init scripts
+#
+
+create_var_run_dir()
+{
+ if [ ! -d /var/run/bacula/ ]; then
+ mkdir -p -m 0755 /var/run/bacula/
+ chown bacula:daemon /var/run/bacula/
+ fi
+}
diff --git a/debian/bacula-common.install b/debian/bacula-common.install
index 1d9f3ab..0a5974d 100644
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@ -6,7 +6,8 @@ usr/lib/bacula/libbac-*.so
usr/lib/bacula/libbacpy*.so
usr/sbin/btraceback usr/lib/bacula
usr/sbin/bsmtp usr/lib/bacula
-debian/common-functions usr/share/bacula-common
+debian/additions/common-functions.init usr/share/bacula-common
+debian/additions/common-functions.dpkg usr/share/bacula-common
etc/bacula/tray-monitor.conf usr/share/bacula-common/defconfig
etc/bacula/bat.conf usr/share/bacula-common/defconfig
etc/bacula/bconsole.conf usr/share/bacula-common/defconfig
diff --git a/debian/bacula-common.postinst b/debian/bacula-common.postinst
index 4e457e4..9c7446a 100644
--- a/debian/bacula-common.postinst
+++ b/debian/bacula-common.postinst
@@ -32,7 +32,7 @@ case "$1" in
chown bacula:adm /var/log/bacula
chmod 750 /var/log/bacula
- . /usr/share/bacula-common/common-functions
+ . /usr/share/bacula-common/common-functions.dpkg
readOrCreatePasswords # create our common passwords if needed
;;
diff --git a/debian/bacula-director-common.install b/debian/bacula-director-common.install
index eaaa134..4e9de64 100644
--- a/debian/bacula-director-common.install
+++ b/debian/bacula-director-common.install
@@ -2,4 +2,3 @@ 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-director-mysql.bacula-director.init b/debian/bacula-director-mysql.bacula-director.init
index dba6559..ca03266 100644
--- a/debian/bacula-director-mysql.bacula-director.init
+++ b/debian/bacula-director-mysql.bacula-director.init
@@ -32,7 +32,7 @@ fi
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
. /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.init
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
@@ -92,11 +92,6 @@ do_stop()
case "$1" in
start)
- if [ -f /etc/bacula/do_not_run ]; then
- 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/$NAME"
exit 0
diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
index 9c9631f..7b99b2a 100644
--- a/debian/bacula-director-mysql.postinst
+++ b/debian/bacula-director-mysql.postinst
@@ -45,8 +45,9 @@ if [ -n "$2" ]; then
sleep 1
fi
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.dpkg
readOrCreatePasswords
+setup_etc_default bacula-director-mysql $@
case "$1" in
configure)
diff --git a/debian/bacula-director-mysql.postrm b/debian/bacula-director-mysql.postrm
index 17b8cfc..72f8699 100644
--- a/debian/bacula-director-mysql.postrm
+++ b/debian/bacula-director-mysql.postrm
@@ -41,6 +41,16 @@ case "$1" in
# Drop Bacula's user privileges? Can't do
# Potentially, drop DB ... Can't do?
db_purge
+
+ # purge /etc/default/bacula-dir
+ rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
+ /etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
+ if which ucf >/dev/null; then
+ ucf --purge /etc/default/bacula-dir
+ fi
+ if which ucfr >/dev/null; then
+ ucfr --purge bacula-director-mysql /etc/default/bacula-dir
+ fi
;;
remove)
diff --git a/debian/bacula-director-pgsql.bacula-director.init b/debian/bacula-director-pgsql.bacula-director.init
index dba6559..ca03266 100644
--- a/debian/bacula-director-pgsql.bacula-director.init
+++ b/debian/bacula-director-pgsql.bacula-director.init
@@ -32,7 +32,7 @@ fi
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
. /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.init
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
@@ -92,11 +92,6 @@ do_stop()
case "$1" in
start)
- if [ -f /etc/bacula/do_not_run ]; then
- 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/$NAME"
exit 0
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
index 7ae9fc7..6224508 100644
--- a/debian/bacula-director-pgsql.postinst
+++ b/debian/bacula-director-pgsql.postinst
@@ -51,8 +51,9 @@ if [ -n "$2" ]; then
sleep 1
fi
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.dpkg
readOrCreatePasswords
+setup_etc_default bacula-director-pgsql $@
case "$1" in
configure)
diff --git a/debian/bacula-director-pgsql.postrm b/debian/bacula-director-pgsql.postrm
index fe0d556..ca327de 100644
--- a/debian/bacula-director-pgsql.postrm
+++ b/debian/bacula-director-pgsql.postrm
@@ -43,6 +43,16 @@ case "$1" in
rm -f $CONFFILE $CONFFILE.dist $AUTHFILE
db_purge
+
+ # purging /etc/default/bacula-dir
+ rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
+ /etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
+ if which ucf >/dev/null; then
+ ucf --purge /etc/default/bacula-dir
+ fi
+ if which ucfr >/dev/null; then
+ ucfr --purge bacula-director-pgsql /etc/default/bacula-dir
+ fi
;;
remove)
diff --git a/debian/bacula-director-sqlite3.bacula-director.init b/debian/bacula-director-sqlite3.bacula-director.init
index dba6559..ca03266 100644
--- a/debian/bacula-director-sqlite3.bacula-director.init
+++ b/debian/bacula-director-sqlite3.bacula-director.init
@@ -32,7 +32,7 @@ fi
PIDFILE=/var/run/bacula/$NAME.$PORT.pid
. /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.init
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
@@ -92,11 +92,6 @@ do_stop()
case "$1" in
start)
- if [ -f /etc/bacula/do_not_run ]; then
- 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/$NAME"
exit 0
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index 4a0c951..a42d44e 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -48,8 +48,9 @@ POSTINST_COMMON="/usr/share/bacula-director/postinst-common"
DEFCONFIG="/usr/share/bacula-common/defconfig"
CFGFILE="/etc/bacula/bacula-dir.conf"
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.dpkg
readOrCreatePasswords
+setup_etc_default bacula-director-sqlite3 $@
case "$1" in
configure)
diff --git a/debian/bacula-director-sqlite3.postrm b/debian/bacula-director-sqlite3.postrm
index bd21108..a0a9902 100644
--- a/debian/bacula-director-sqlite3.postrm
+++ b/debian/bacula-director-sqlite3.postrm
@@ -27,6 +27,16 @@ case "$1" in
purge)
rm -f $CONFFILE $CONFFILE.dist
db_purge
+
+ # purge /etc/default/bacula-dir
+ rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
+ /etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
+ if which ucf >/dev/null; then
+ ucf --purge /etc/default/bacula-dir
+ fi
+ if which ucfr >/dev/null; then
+ ucfr --purge bacula-director-sqlite3 /etc/default/bacula-dir
+ fi
;;
remove)
;;
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index 8834ef1..676b1bd 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -30,7 +30,7 @@ if [ -n "`getent services bacula-fd`" ]; then
fi
. /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.init
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
@@ -56,11 +56,6 @@ do_stop()
case "$1" in
start)
- if [ -f /etc/bacula/do_not_run ]; then
- 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/$NAME"
exit 0
diff --git a/debian/bacula-fd.install b/debian/bacula-fd.install
index cf8404e..f92725e 100644
--- a/debian/bacula-fd.install
+++ b/debian/bacula-fd.install
@@ -1,3 +1,2 @@
usr/sbin/bacula-fd
usr/lib/bacula/bpipe-fd.so
-debian/default/bacula-fd etc/default
diff --git a/debian/bacula-fd.postinst b/debian/bacula-fd.postinst
index 45f0175..cf19a84 100644
--- a/debian/bacula-fd.postinst
+++ b/debian/bacula-fd.postinst
@@ -29,8 +29,9 @@ SRCDIR="/usr/share/bacula-common/defconfig"
DSTDIR="/etc/bacula"
CONFIG="bacula-fd.conf"
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.dpkg
readOrCreatePasswords
+setup_etc_default bacula-fd $@
case "$1" in
configure)
diff --git a/debian/bacula-fd.postrm b/debian/bacula-fd.postrm
index 1996dd6..940b91f 100644
--- a/debian/bacula-fd.postrm
+++ b/debian/bacula-fd.postrm
@@ -21,6 +21,16 @@ set -e
case "$1" in
purge)
rm -f /etc/bacula/bacula-fd.*
+
+ # purge /etc/default/bacula-fd
+ rm -f /etc/default/bacula-fd /etc/default/bacula-fd.ucf-old \
+ /etc/default/bacula-fd.ucf-new /etc/default/bacula-fd.ucf-dist
+ if which ucf >/dev/null; then
+ ucf --purge /etc/default/bacula-fd
+ fi
+ if which ucfr >/dev/null; then
+ ucfr --purge bacula-fd /etc/default/bacula-fd
+ fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index e70e6aa..334704b 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -28,7 +28,7 @@ if [ -n "`getent services bacula-sd`" ]; then
fi
. /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.init
if [ -r /etc/default/$NAME ]; then
. /etc/default/$NAME
fi
@@ -53,11 +53,6 @@ do_stop()
case "$1" in
start)
- if [ -f /etc/bacula/do_not_run ]; then
- 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/$NAME"
exit 0
diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index 8bd2078..b5b5ea2 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -5,4 +5,3 @@ 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/bacula-sd.postinst b/debian/bacula-sd.postinst
index ed1212f..422afc0 100644
--- a/debian/bacula-sd.postinst
+++ b/debian/bacula-sd.postinst
@@ -29,8 +29,9 @@ SRCDIR="/usr/share/bacula-common/defconfig"
DSTDIR="/etc/bacula"
CONFIG="bacula-sd.conf"
-. /usr/share/bacula-common/common-functions
+. /usr/share/bacula-common/common-functions.dpkg
readOrCreatePasswords
+setup_etc_default bacula-sd $@
case "$1" in
configure)
diff --git a/debian/bacula-sd.postrm b/debian/bacula-sd.postrm
index 3ea05a9..30c3059 100644
--- a/debian/bacula-sd.postrm
+++ b/debian/bacula-sd.postrm
@@ -21,6 +21,16 @@ set -e
case "$1" in
purge)
rm -f /etc/bacula/bacula-sd.*
+
+ # purge /etc/default/bacula-sd
+ rm -f /etc/default/bacula-sd /etc/default/bacula-sd.ucf-old \
+ /etc/default/bacula-sd.ucf-new /etc/default/bacula-sd.ucf-dist
+ if which ucf >/dev/null; then
+ ucf --purge /etc/default/bacula-sd
+ fi
+ if which ucfr >/dev/null; then
+ ucfr --purge bacula-sd /etc/default/bacula-sd
+ fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff --git a/debian/changelog b/debian/changelog
index 414dd2a..74e5698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
(Closes: #646730):
+ fix ncurses requirement for readline-compiled bconsole, thanks
to Sven Joachim <svenjoac at gmx.de>.
+ * debian/*:
+ + Add seamless migrating from /etc/bacula/do_not_run to /etc/default/*.
[ Bartosz Cisek ]
* debian/rules:
diff --git a/debian/common-functions b/debian/common-functions
deleted file mode 100644
index 5385711..0000000
--- a/debian/common-functions
+++ /dev/null
@@ -1,49 +0,0 @@
-create_var_run_dir()
-{
- if [ ! -d /var/run/bacula/ ]; then
- mkdir -p -m 0755 /var/run/bacula/
- chown bacula:daemon /var/run/bacula/
- fi
-}
-
-genRandomPassword()
-{
- cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c33
-}
-
-readOrCreatePasswords()
-{
- BACULAPWFILE=/etc/bacula/common_default_passwords
- if [ -f $BACULAPWFILE ]; then
- . $BACULAPWFILE
- fi
-
- if [ -z "$DIRPASSWD" -o -z "$DIRMPASSWD" -o -z "$SDPASSWD" -o \
- -z "$SDMPASSWD" -o -z "$FDPASSWD" -o -z "$FDMPASSWD" ] ; then
- # Create the passwords.
- DIRPASSWD=`genRandomPassword`
- DIRMPASSWD=`genRandomPassword`
- SDPASSWD=`genRandomPassword`
- SDMPASSWD=`genRandomPassword`
- FDPASSWD=`genRandomPassword`
- FDMPASSWD=`genRandomPassword`
-
- # Save the passwords.
- echo "# " > $BACULAPWFILE
- chown root:root $BACULAPWFILE
- chmod 0600 $BACULAPWFILE
- cat >>$BACULAPWFILE <<EOF
-# This file holds defaults for new Bacula packages installed on this system.
-# It is used only when you install a new Bacula package, and can be
-# safely removed at any time.
-
-DIRPASSWD=$DIRPASSWD
-DIRMPASSWD=$DIRMPASSWD
-SDPASSWD=$SDPASSWD
-SDMPASSWD=$SDMPASSWD
-FDPASSWD=$FDPASSWD
-FDMPASSWD=$FDMPASSWD
-EOF
- fi
-}
-
diff --git a/debian/control b/debian/control
index 7a13681..e2d29de 100644
--- a/debian/control
+++ b/debian/control
@@ -164,7 +164,7 @@ Description: backup system - debug symbols for the Director common files
Package: bacula-director-sqlite3
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), sqlite3, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common, ${misc:Depends}
+Depends: bacula-director-common (= ${binary:Version}), sqlite3, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common, ucf, ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@ -199,7 +199,7 @@ Description: backup system - debug symbols for the SQLite 3 storage for Director
Package: bacula-director-mysql
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, mysql-client, ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ${misc:Depends}
+Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, mysql-client, ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ucf, ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@ -235,7 +235,7 @@ Description: backup system - debug symbols for the MySQL storage for Director
Package: bacula-director-pgsql
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
+Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ucf, ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@ -287,7 +287,7 @@ Description: network backup, recovery and verification - client meta-package
Package: bacula-fd
Architecture: any
-Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, lsb-base, ${misc:Depends}
+Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, ucf, lsb-base, ${misc:Depends}
Suggests: bacula-traymonitor
Description: network backup, recovery and verification - file daemon
Bacula is a set of programs to manage backup, recovery and verification of
@@ -326,7 +326,7 @@ Description: network backup, recovery and verification - server meta-package
Package: bacula-sd
Architecture: any
Pre-Depends: bacula-common (= ${binary:Version})
-Depends: ${shlibs:Depends}, mtx, python, lsb-base, ${misc:Depends}
+Depends: ${shlibs:Depends}, mtx, python, lsb-base, ${misc:Depends}, ucf
Recommends: mt-st, bacula-sd-sqlite3 (>= ${source:Version})|bacula-sd-tools
Suggests: dds2tar, scsitools, sg3-utils
Description: network backup, recovery and verification - storage daemon
diff --git a/debian/default/bacula-dir b/debian/default/bacula-dir
deleted file mode 100644
index 23d52ed..0000000
--- a/debian/default/bacula-dir
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
deleted file mode 100644
index 35341c3..0000000
--- a/debian/default/bacula-fd
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
deleted file mode 100644
index 4b44f5c..0000000
--- a/debian/default/bacula-sd
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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=
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list