[pkg-bacula-commits] [bacula] 02/02: Disable dbconfig creation of the sourceable shell script by dbconfig for now. The mechanism might be put to better use to create an include file for the Catalog section in bacula-dir.conf

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch migrate-files
in repository bacula.

commit 2eaade9e9255197bf069012df6acd8994b9f9184
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Aug 22 13:50:53 2016 +0200

    Disable dbconfig creation of the sourceable shell script by dbconfig
    for now. The mechanism might be put to better use to create an include
    file for the Catalog section in bacula-dir.conf
---
 debian/bacula-director-db.postinst.in |  8 +++++---
 debian/bacula-director-db.postrm.in   | 16 +++++++++-------
 debian/changelog                      |  2 --
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/bacula-director-db.postinst.in b/debian/bacula-director-db.postinst.in
index beec30a..6906249 100644
--- a/debian/bacula-director-db.postinst.in
+++ b/debian/bacula-director-db.postinst.in
@@ -40,10 +40,12 @@ case "$THISDB" in
 	;;
 esac
 
+# XXX disabled for now, the mechanism might be better used to create
+#     an include for bacula-dir.conf?
 # generate a config file containing relevant database information
-dbc_generate_include=sh:/etc/bacula/dbc_database.conf
-dbc_generate_include_owner=bacula:bacula
-dbc_generate_include_perms=0640
+#dbc_generate_include=sh:/etc/bacula/dbc_database.conf
+#dbc_generate_include_owner=bacula:bacula
+#dbc_generate_include_perms=0640
 
 if test "$1" = "configure" -a -n "$2"; then
 	invoke-rc.d bacula-director stop || true
diff --git a/debian/bacula-director-db.postrm.in b/debian/bacula-director-db.postrm.in
index 58a3539..f1ad40a 100644
--- a/debian/bacula-director-db.postrm.in
+++ b/debian/bacula-director-db.postrm.in
@@ -44,14 +44,16 @@ case "$1" in
   ;;
 esac
 
+# XXX disabled for now, the mechanism might be better used to create
+#     an include for bacula-dir.conf?
 # remove and unregister dbc_database.conf on purge
-if [ "$1" = "purge" ]; then
-    rm -f /etc/bacula/dbc_database.conf
-    if which ucf >/dev/null 2>&1; then
-	ucf --purge /etc/bacula/dbc_database.conf
-	ucfr --purge bacula-director-$THISDB /etc/bacula/dbc_database.conf
-    fi
-fi
+#if [ "$1" = "purge" ]; then
+#    rm -f /etc/bacula/dbc_database.conf
+#    if which ucf >/dev/null 2>&1; then
+#	ucf --purge /etc/bacula/dbc_database.conf
+#	ucfr --purge bacula-director-$THISDB /etc/bacula/dbc_database.conf
+#    fi
+#fi
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/debian/changelog b/debian/changelog
index 4cac8c9..4c4c6ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
 bacula (7.4.3+dfsg-4) experimental; urgency=medium
 
-  * bacula-director-DBTYPE: let dbconfig create a sourceable shell script
-    with database information
   * Fix init scripts to make sure the daemons can be stopped before
     upgrades or when /etc/defaults/bacula-* were edited
     (merged from 7.4.3+dfsg-1+sid1)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git