[pkg-bacula-commits] [bacula] 01/01: consolidate the three bacula-director-*sql*.postinst in a single bacula-director-db.postinst.in set scripts/delete_catalog_backup as executable (Closes: #714161, #718641) unify indentation
Carsten Leonhardt
cl-guest at moszumanska.debian.org
Sun Jul 26 20:36:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
cl-guest pushed a commit to branch master
in repository bacula.
commit 509331a4f74f5201e46deb8c37347b9b5db4c7a9
Author: Carsten Leonhardt <leo at debian.org>
Date: Sun Jul 26 22:32:17 2015 +0200
consolidate the three bacula-director-*sql*.postinst in a single bacula-director-db.postinst.in
set scripts/delete_catalog_backup as executable (Closes: #714161, #718641)
unify indentation
---
debian/bacula-director-db.postinst.in | 143 ++++++++++++++++++++++++++++++++
debian/bacula-director-mysql.postinst | 100 ----------------------
debian/bacula-director-pgsql.postinst | 110 ------------------------
debian/bacula-director-sqlite3.postinst | 104 -----------------------
4 files changed, 143 insertions(+), 314 deletions(-)
diff --git a/debian/bacula-director-db.postinst.in b/debian/bacula-director-db.postinst.in
new file mode 100644
index 0000000..435b248
--- /dev/null
+++ b/debian/bacula-director-db.postinst.in
@@ -0,0 +1,143 @@
+#!/bin/sh
+# postinst script for bacula-director-pgsql
+#
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+# quoting from the policy:
+# Any necessary prompting should almost always be confined to the
+# post-installation script, and should be protected with a conditional
+# so that unnecessary prompting doesn't happen if a package's
+# installation fails and the `postinst' is called with `abort-upgrade',
+# `abort-remove' or `abort-deconfigure'.
+
+THISDB=XX_DB_XX
+
+case "$THISDB" in
+ mysql)
+ dbc_first_version=1.38.9-3
+ ;;
+ pgsql)
+ dbc_first_version=1.38.9-2
+ ;;
+ sqlite3)
+ dbc_first_version=3.0.3-3
+ dbc_dbfile_owner=bacula:bacula
+ ;;
+esac
+
+if test "$1" = "configure" -a -n "$2" && dpkg --compare-versions "$2" lt "5.2.6+dfsg-1"; then
+ invoke-rc.d bacula-director stop || true
+fi
+
+# source dbconfig-common shell library, and call the hook function
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.$THISDB ]; then
+ . /usr/share/dbconfig-common/dpkg/postinst.$THISDB
+ if [ $THISDB = pgsql ]; then
+ dbc_pgsql_createdb_encoding="SQL_ASCII"
+ dbc_sql_substitutions="1"
+ fi
+ dbc_go bacula-director-$THISDB $@
+fi
+
+LOGDIR="/var/log/bacula"
+POSTINST_COMMON="/usr/share/bacula-director/postinst-common"
+DEFCONFIG="/usr/share/bacula-common/defconfig"
+CFGFILE="/etc/bacula/bacula-dir.conf"
+if [ $THISDB = pgsql ]; then
+ CATALOG=bacula
+ PGSQL=/usr/bin/psql
+ GRANT_SQL_PRIVS="/usr/share/bacula-director/grant_pgsql_privileges"
+ AUTHFILE=`getent passwd bacula | cut -d ':' -f 6`/.pgpass
+fi
+
+
+. /usr/share/bacula-common/common-functions.dpkg
+readOrCreatePasswords
+setup_etc_default bacula-director-$THISDB $@
+
+case "$1" in
+configure)
+ check_and_fix_unsafe_director_password bacula-director-$THISDB
+
+ echo -n "Processing configuration..."
+ . /etc/dbconfig-common/bacula-director-$THISDB.conf
+ TARGET=$CFGFILE.dpkg-tmp
+
+ if [ "$dbc_install" = "true" ] ; then
+ sed -e s~XXX_DIRPASSWORD_XXX~$DIRPASSWD~ \
+ -e s~XXX_MONDIRPASSWORD_XXX~$DIRMPASSWD~ \
+ -e s~XXX_SDPASSWORD_XXX~$SDPASSWD~ \
+ -e s~XXX_FDPASSWORD_XXX~$FDPASSWD~ \
+ $DEFCONFIG/bacula-dir.conf > $TARGET
+ case "$THISDB" in
+ mysql | pgsql)
+ sed -e "s/dbname = \"XXX_DBNAME_XXX\";/dbname = \"$dbc_dbname\"; DB Address = \"$dbc_dbserver\";/" \
+ -e "s~/XXX_DBNAME_XXX~/$dbc_dbname~" \
+ -e "s/XXX_DBUSER_XXX/$dbc_dbuser/" -e "s/XXX_DBPASSWORD_XXX/$dbc_dbpass/" \
+ -i $TARGET
+ ;;
+ sqlite3)
+ BACULADBNAME=`echo "$dbc_dbname" | sed 's/.db$//'`
+ sed -e "s~/XXX_DBNAME_XXX~/$BACULADBNAME~" \
+ -e "s~\"XXX_DBNAME_XXX~\"$BACULADBNAME~" \
+ -e s~XXX_DBUSER_XXX~~ \
+ -e s~XXX_DBPASSWORD_XXX~~ \
+ -i $TARGET
+ ;;
+ esac
+ fi
+
+ case "$THISDB" in
+ mysql | pgsql)
+ DBNAME="$dbc_dbname"
+ ;;
+ sqlite3)
+ DBNAME="$BACULADBNAME"
+ ;;
+ esac
+ SUBST_VARIABLES=DBNAME
+ install_config \
+ bacula-director-$THISDB \
+ /usr/share/bacula-common/defconfig/scripts/delete_catalog_backup \
+ /etc/bacula/scripts/delete_catalog_backup
+ chmod 755 /etc/bacula/scripts/delete_catalog_backup
+
+ sh $POSTINST_COMMON
+ echo "Ok."
+ ;;
+
+abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+*)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+
+
+# Do start daemon
+db_stop
+
+invoke-rc.d bacula-director start || exit $?-
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
deleted file mode 100644
index f3fab5c..0000000
--- a/debian/bacula-director-mysql.postinst
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-# postinst script for bacula-director-mysql
-#
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-dbc_first_version=1.38.9-3
-# set in config, must not be set here: dbc_dbuser=bacula
-# set in config, must not be set here: dbc_dbname=bacula
-
-if test "$1" = "configure" -a -n "$2" && dpkg --compare-versions "$2" lt "5.2.6+dfsg-1"; then
- invoke-rc.d bacula-director stop || true
-fi
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
- . /usr/share/dbconfig-common/dpkg/postinst.mysql
- dbc_go bacula-director-mysql $@
-fi
-
-LOGDIR="/var/log/bacula"
-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.dpkg
-readOrCreatePasswords
-setup_etc_default bacula-director-mysql $@
-
-case "$1" in
-configure)
- check_and_fix_unsafe_director_password bacula-director-mysql
-
- echo -n "Processing configuration..."
- . /etc/dbconfig-common/bacula-director-mysql.conf
- TARGET=$CFGFILE.dpkg-tmp
- # FIXME: should this tweak make_catalog_backup like bacula-director-pgsql.postinst does?
- sed -e "s/dbname = \"XXX_DBNAME_XXX\";/dbname = \"$dbc_dbname\"; DB Address = \"$dbc_dbserver\";/" \
- -e "s~/XXX_DBNAME_XXX~/$dbc_dbname~" \
- -e "s/XXX_DBUSER_XXX/$dbc_dbuser/" -e "s/XXX_DBPASSWORD_XXX/$dbc_dbpass/" \
- -e s~XXX_DIRPASSWORD_XXX~$DIRPASSWD~ \
- -e s~XXX_MONDIRPASSWORD_XXX~$DIRMPASSWD~ \
- -e s~XXX_SDPASSWORD_XXX~$SDPASSWD~ \
- -e s~XXX_FDPASSWORD_XXX~$FDPASSWD~ \
- $DEFCONFIG/bacula-dir.conf > $TARGET
-
-
- DBNAME="$dbc_dbname"
- 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
-
- echo "Ok."
- ;;
-
-abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
-*)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# Do start daemon
-db_stop
-
-invoke-rc.d bacula-director start || exit $?-
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
deleted file mode 100644
index 05b453b..0000000
--- a/debian/bacula-director-pgsql.postinst
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/sh
-# postinst script for bacula-director-pgsql
-#
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-dbc_first_version=1.38.9-2
-# set in config, must not be set here: dbc_dbuser=bacula
-# set in config, must not be set here: dbc_dbname=bacula
-
-if test "$1" = "configure" -a -n "$2" && dpkg --compare-versions "$2" lt "5.2.6+dfsg-1"; then
- invoke-rc.d bacula-director stop || true
-fi
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
- . /usr/share/dbconfig-common/dpkg/postinst.pgsql
- dbc_pgsql_createdb_encoding="SQL_ASCII"
- dbc_sql_substitutions="1"
- dbc_go bacula-director-pgsql $@
-fi
-
-LOGDIR="/var/log/bacula"
-POSTINST_COMMON="/usr/share/bacula-director/postinst-common"
-DEFCONFIG="/usr/share/bacula-common/defconfig"
-CFGFILE="/etc/bacula/bacula-dir.conf"
-CATALOG=bacula
-PGSQL=/usr/bin/psql
-GRANT_SQL_PRIVS="/usr/share/bacula-director/grant_pgsql_privileges"
-AUTHFILE=`getent passwd bacula | cut -d ':' -f 6`/.pgpass
-
-
-. /usr/share/bacula-common/common-functions.dpkg
-readOrCreatePasswords
-setup_etc_default bacula-director-pgsql $@
-
-case "$1" in
-configure)
- check_and_fix_unsafe_director_password bacula-director-pgsql
-
- echo -n "Processing configuration..."
- . /etc/dbconfig-common/bacula-director-pgsql.conf
- TARGET=$CFGFILE.dpkg-tmp
-
- if [ "$dbc_install" = "true" ] ; then
- sed -e "s/make_catalog_backup bacula bacula/make_catalog_backup -h '$dbc_dbserver' -U $dbc_dbuser/" \
- -e "s/dbname = \"XXX_DBNAME_XXX\";/dbname = \"$dbc_dbname\"; DB Address = \"$dbc_dbserver\";/" \
- -e "s~/XXX_DBNAME_XXX~/$dbc_dbname~" \
- -e "s/XXX_DBUSER_XXX/$dbc_dbuser/" -e "s/XXX_DBPASSWORD_XXX/$dbc_dbpass/" \
- -e s~XXX_DIRPASSWORD_XXX~$DIRPASSWD~ \
- -e s~XXX_MONDIRPASSWORD_XXX~$DIRMPASSWD~ \
- -e s~XXX_SDPASSWORD_XXX~$SDPASSWD~ \
- -e s~XXX_FDPASSWORD_XXX~$FDPASSWD~ \
- $DEFCONFIG/bacula-dir.conf > $TARGET
- fi
-
-
- DBNAME="$dbc_dbname"
- 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."
- ;;
-
-abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
-*)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-
-
-# Do start daemon
-db_stop
-
-invoke-rc.d bacula-director start || exit $?-
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
deleted file mode 100644
index 87de84d..0000000
--- a/debian/bacula-director-sqlite3.postinst
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-# postinst script for bacula-director-sqlite3
-#
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-# Any necessary prompting should almost always be confined to the
-# post-installation script, and should be protected with a conditional
-# so that unnecessary prompting doesn't happen if a package's
-# installation fails and the `postinst' is called with `abort-upgrade',
-# `abort-remove' or `abort-deconfigure'.
-
-dbc_first_version=3.0.3-3
-dbc_dbfile_owner=bacula:bacula
-# set in config, must not be set here: dbc_dbuser=bacula
-# set in config, must not be set here: dbc_dbname=bacula.db
-# set in config, must not be set here: dbc_basepath=/var/lib/bacula
-
-if test "$1" = "configure" -a -n "$2" && dpkg --compare-versions "$2" lt "5.2.6+dfsg-1"; then
- invoke-rc.d bacula-director stop || true
-fi
-
-# source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
- . /usr/share/dbconfig-common/dpkg/postinst.sqlite3
- dbc_go bacula-director-sqlite3 $@
-fi
-
-LOGDIR="/var/log/bacula"
-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.dpkg
-readOrCreatePasswords
-setup_etc_default bacula-director-sqlite3 $@
-
-case "$1" in
-configure)
- check_and_fix_unsafe_director_password bacula-director-sqlite3
-
- echo -n "Processing configuration..."
- . /etc/dbconfig-common/bacula-director-sqlite3.conf
- TARGET=$CFGFILE.dpkg-tmp
- # FIXME: should this tweak make_catalog_backup like bacula-director-pgsql.postinst does?
- BACULADBNAME=`echo "$dbc_dbname" | sed 's/.db$//'`
-
- sed -e s~XXX_DIRPASSWORD_XXX~$DIRPASSWD~ \
- -e s~XXX_MONDIRPASSWORD_XXX~$DIRMPASSWD~ \
- -e s~XXX_SDPASSWORD_XXX~$SDPASSWD~ \
- -e s~XXX_FDPASSWORD_XXX~$FDPASSWD~ \
- -e "s~/XXX_DBNAME_XXX~/$BACULADBNAME~" \
- -e "s~\"XXX_DBNAME_XXX~\"$BACULADBNAME~" \
- -e s~XXX_DBUSER_XXX~~ \
- -e s~XXX_DBPASSWORD_XXX~~ \
- $DEFCONFIG/bacula-dir.conf > $TARGET
-
-
- DBNAME="$BACULADBNAME"
- 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
-
- echo "Ok."
- ;;
-
-abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
-*)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# Do start daemon
-db_stop
-
-invoke-rc.d bacula-director start || exit $?-
-
-#DEBHELPER#
-
-exit 0
--
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