[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-5-15-g1891544

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 345e49e15c5ba64820c32cac4e34ea7faf6ccfd1
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sat Oct 6 19:22:55 2012 +0400

    switch delete_catalog_backup script under ucf control

diff --git a/debian/bacula-director-db.postrm.in b/debian/bacula-director-db.postrm.in
index af9608e..a51fab2 100644
--- a/debian/bacula-director-db.postrm.in
+++ b/debian/bacula-director-db.postrm.in
@@ -22,20 +22,28 @@ case "$1" in
 	purge)
 		rm -f $CONFFILE $CONFFILE.dist
 
-		# purge /etc/default/bacula-dir if there was not installed package
+
+    UCF_CONFIG_FILES="/etc/default/bacula-dir \
+      /etc/bacula/scripts/delete_catalog_backup"
+
+		# purge configs if there are no installed package
 		# for other database type
-		if ! which ucfq >/dev/null || ucfq -w "/etc/default/bacula-dir" \
-			|egrep -q "^[^:]*:bacula-director-$THISDB:"; 
-		then
-			rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
-				/etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
+    for CONF in $UCF_CONFIG_FILES; do
+      if which ucfq >/dev/null && \
+        ! (ucfq -w "$CONF" |egrep -q "^$CONF:bacula-director-$THISDB:");
+      then
+        continue
+      fi
+
+			rm -f "$CONF" "$CONF.ucf-old" "$CONF.ucf-new" "$CONF.ucf-dist"
+
 			if which ucf >/dev/null; then
-				ucf --purge /etc/default/bacula-dir
+				ucf --purge "$CONF"
 			fi
 			if which ucfr >/dev/null; then
-				ucfr --purge bacula-director-$THISDB /etc/default/bacula-dir
+				ucfr --purge bacula-director-$THISDB "$CONF"
 			fi
-		fi
+		done
 	;;
 esac
 
diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
index 77fc949..66ece38 100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@ -1,6 +1,7 @@
 etc/bacula/scripts/make_mysql_tables usr/share/bacula-director
 etc/bacula/scripts/update_mysql* usr/share/bacula-director
-etc/bacula/scripts/*catalog_backup
+etc/bacula/scripts/make_catalog_backup
+etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
 etc/bacula/scripts/*catalog_backup.pl
 debian/additions/mysql/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
index 59b4c65..9e5626f 100644
--- a/debian/bacula-director-mysql.postinst
+++ b/debian/bacula-director-mysql.postinst
@@ -66,7 +66,14 @@ configure)
 	-e s~XXX_FDPASSWORD_XXX~$FDPASSWD~ \
 		$DEFCONFIG/bacula-dir.conf > $TARGET
 
-	sed -i -e "s/XXX_DBNAME_XXX/$dbc_dbname/" /etc/bacula/scripts/delete_catalog_backup
+
+  DBNAME="$dbc_name"
+  SUBST_VARIABLES=DBNAME
+  install_config \
+    bacula-director-mysql \
+    /usr/share/bacula-common/defconfig/scripts/delete_catalog_backup \
+    /etc/bacula/scripts/delete_catalog_backup
+
 
 	sh $POSTINST_COMMON
 
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
index 5c7fdbd..7368210 100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@ -1,7 +1,8 @@
 etc/bacula/scripts/make_postgresql_tables	usr/share/bacula-director
 etc/bacula/scripts/grant_postgresql_privileges usr/share/bacula-director
 etc/bacula/scripts/update_postgres* usr/share/bacula-director
-etc/bacula/scripts/*catalog_backup
+etc/bacula/scripts/make_catalog_backup
+etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
 etc/bacula/scripts/*catalog_backup.pl
 debian/additions/pgsql/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
index c6b7ef5..be44106 100644
--- a/debian/bacula-director-pgsql.postinst
+++ b/debian/bacula-director-pgsql.postinst
@@ -75,7 +75,14 @@ configure)
                 $DEFCONFIG/bacula-dir.conf > $TARGET
         fi
 
-	sed -i -e "s/XXX_DBNAME_XXX/$dbc_dbname/" /etc/bacula/scripts/delete_catalog_backup
+
+  DBNAME="$dbc_name"
+  SUBST_VARIABLES=DBNAME
+  install_config \
+    bacula-director-pgsql \
+    /usr/share/bacula-common/defconfig/scripts/delete_catalog_backup \
+    /etc/bacula/scripts/delete_catalog_backup
+
 
 	sh $POSTINST_COMMON
 	echo "Ok."
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
index b7ed49a..88213fe 100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@ -1,6 +1,7 @@
 etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
 etc/bacula/scripts/update_sqlite* usr/share/bacula-director
-etc/bacula/scripts/*catalog_backup
+etc/bacula/scripts/make_catalog_backup
+etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
 etc/bacula/scripts/*catalog_backup.pl
 debian/additions/sqlite3/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index e1feca1..cbfd28b 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -69,8 +69,15 @@ configure)
 		-e s~XXX_DBUSER_XXX~~ \
 		-e s~XXX_DBPASSWORD_XXX~~ \
 			$DEFCONFIG/bacula-dir.conf > $TARGET
-        
-	sed -i -e "s/XXX_DBNAME_XXX/$dbc_dbname/" /etc/bacula/scripts/delete_catalog_backup
+ 
+
+  DBNAME="$dbc_name"
+  SUBST_VARIABLES=DBNAME
+  install_config \
+    bacula-director-sqlite3 \
+    /usr/share/bacula-common/defconfig/scripts/delete_catalog_backup \
+    /etc/bacula/scripts/delete_catalog_backup
+
 
 	sh $POSTINST_COMMON
 

-- 
Bacula, a network backup, recovery and verification program