[Piuparts-commits] [piuparts] 01/01: fixup: scripts/pre_install_database-server: work around #707075 and force MyISAM storage engine on upgrades from wheezy

[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 4a1b565589137d58799f3fc4e8da97f6c3f8bbd1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 17 11:03:14 2014 +0200

    fixup: scripts/pre_install_database-server: work around #707075 and force MyISAM storage engine on upgrades from wheezy
---
 custom-scripts/scripts/pre_install_database-server | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/custom-scripts/scripts/pre_install_database-server b/custom-scripts/scripts/pre_install_database-server
index c2be416..a50ba37 100755
--- a/custom-scripts/scripts/pre_install_database-server
+++ b/custom-scripts/scripts/pre_install_database-server
@@ -98,12 +98,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	ocsinventory-server)			MYSQL=yes ;;
 	openacs)				POSTGRESQL=yes ;;
 	otrs)					POSTGRESQL=yes ;;
-	otrs2)					POSTGRESQL=yes ; MYSQL=yes
-						if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ]; then
-							# workaround #707075
-							echo default-storage-engine=MYISAM >> /etc/mysql/my.cnf 
-						fi
-						;;
+	otrs2)					POSTGRESQL=yes ; MYSQL=yes ;;
 	pdns-backend-mysql)			MYSQL=yes ;;
 	pdns-backend-pgsql)			POSTGRESQL=yes ;;
 	phpbb3)					MYSQL=yes ;;
@@ -162,6 +157,14 @@ esac
 if [ "$MYSQL" = "yes" ]; then
 	echo "Installing mysql-server..."
 	apt-get -y install mysql-server
+	# workaround #707075
+	case ${PIUPARTS_OBJECTS%%=*} in
+		otrs2)
+			if [ "$PIUPARTS_DISTRIBUTION" = "wheezy" ]; then
+				echo default-storage-engine=MYISAM >> /etc/mysql/my.cnf 
+			fi
+		;;
+	esac
 fi
 
 if [ "$POSTGRESQL" = "yes" ]; then

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