[Piuparts-commits] [piuparts] 01/01: fixup the easy way and workaround 707075 by just not testing with mysql

[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 007fbc63aa63875248cf74d34e91e71273546a7d
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 17 12:13:03 2014 +0200

    fixup the easy way and workaround 707075 by just not testing with mysql
---
 custom-scripts/scripts/pre_install_database-server | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/custom-scripts/scripts/pre_install_database-server b/custom-scripts/scripts/pre_install_database-server
index dba266b..2341395 100755
--- a/custom-scripts/scripts/pre_install_database-server
+++ b/custom-scripts/scripts/pre_install_database-server
@@ -98,7 +98,7 @@ case ${PIUPARTS_OBJECTS%%=*} in
 	ocsinventory-server)			MYSQL=yes ;;
 	openacs)				POSTGRESQL=yes ;;
 	otrs)					POSTGRESQL=yes ;;
-	otrs2)					POSTGRESQL=yes ; MYSQL=yes ;;
+	otrs2)					POSTGRESQL=yes ;; # workaround #707075: don't use MYSQL=yes
 	pdns-backend-mysql)			MYSQL=yes ;;
 	pdns-backend-pgsql)			POSTGRESQL=yes ;;
 	phpbb3)					MYSQL=yes ;;
@@ -157,14 +157,6 @@ 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" ] && [ -d /etc/mysql ]; 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