[Piuparts-commits] [piuparts] 04/16: more database-dependency related tuning

[Holger Levsen]

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

holger pushed a commit to branch develop
in repository piuparts.

commit a6ba251d47808fd7714e4c8d627c6caef68c57c2
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Apr 10 20:52:27 2017 +0200

    more database-dependency related tuning
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 custom-scripts/scripts/pre_distupgrade_zz_database-server | 15 +++++++++++----
 custom-scripts/scripts/pre_install_database-server        |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/custom-scripts/scripts/pre_distupgrade_zz_database-server b/custom-scripts/scripts/pre_distupgrade_zz_database-server
index 6636183..6e6d6bd 100755
--- a/custom-scripts/scripts/pre_distupgrade_zz_database-server
+++ b/custom-scripts/scripts/pre_distupgrade_zz_database-server
@@ -75,7 +75,8 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "stretch" ]; then
 		bareos-database-mysql)
 			SWITCH_TO_MARIADB=yes
 			;;
-		icinga2-ido-mysql)
+		icinga2-ido-mysql|\
+		icinga-web-config-icinga2-ido-mysql)
 			SWITCH_TO_MARIADB=yes
 			;;
 		openstack-cloud-services|\
@@ -84,6 +85,7 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "stretch" ]; then
 			;;
 		pdns-backend-mysql)
 			SWITCH_TO_MARIADB=yes
+			RETRY="retry_configure_pending"
 			;;
 		phpmyadmin)
 			SWITCH_TO_MARIADB=yes
@@ -94,6 +96,11 @@ if [ "$PIUPARTS_DISTRIBUTION_NEXT" = "stretch" ]; then
 		redmine-mysql)
 			SWITCH_TO_MARIADB=yes
 			;;
+		roundcube-core|\
+		roundcube|\
+		roundcube-plugins)
+			SWITCH_TO_MARIADB=yes
+			;;
 		tango-db|\
 		tango-db-dbg|\
 		tango-accesscontrol|\
@@ -125,7 +132,7 @@ test ! -x /usr/bin/pg_lsclusters || pg_lsclusters
 
 if [ -n "$PACKAGES" ]
 then
-	echo "Upgrading ${PACKAGES# } early"
+	echo "Upgrading early: ${PACKAGES# }"
 	apt-get update
 	apt-get -y install $PACKAGES || $RETRY
 fi
@@ -143,14 +150,14 @@ upgrade_pg_cluster()
 	if ! is_installed postgresql-${to}
 	then
 		echo ""
-		echo "Installing postgresql-${to}"
+		echo "Installing: postgresql-${to}"
 		apt-get -y install postgresql-${to}
 	fi
 
 	if is_installed postgresql-${from} && is_installed postgresql-${to}
 	then
 		echo ""
-		echo "Updating PostgreSQL Cluster from ${from} to ${to}"
+		echo "Upgrading PostgreSQL Cluster from ${from} to ${to}"
 		pg_dropcluster ${to} main --stop
 		pg_upgradecluster -v ${to} ${from} main
 		pg_dropcluster ${from} main
diff --git a/custom-scripts/scripts/pre_install_database-server b/custom-scripts/scripts/pre_install_database-server
index 3812ab4..a1a6df7 100755
--- a/custom-scripts/scripts/pre_install_database-server
+++ b/custom-scripts/scripts/pre_install_database-server
@@ -88,6 +88,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	icinga2-ido-pgsql)			POSTGRESQL=yes ;;
 	jclicmoodle)				POSTGRESQL=yes ;;
 	jffnms)					MYSQL=yes ;;
+	kopano-server)				MYSQL=yes ;;
 	letodms)				MYSQL=yes ;;
 	letodms-webdav)				MYSQL=yes ;;
 	libchado-perl)				POSTGRESQL=yes ;;
@@ -136,6 +137,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	postfix-policyd)			MYSQL=yes ;;
 	postfixadmin)				MYSQL=yes ;;
 	prelude-manager)			MYSQL=yes ;;
+	prelude-manager-dbgsym)			MYSQL=yes ;;
 	prewikka)				MYSQL=yes ;;
 	pybit-web)				POSTGRESQL=yes ;;
 	python-django-horizon)			SQLITE3=yes ;;

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