From 1be8bc16d4f31f15b3fd2be575c744845ff236a9 Mon Sep 17 00:00:00 2001
From: alban <alban@octopuce.fr>
Date: Mon, 29 Sep 2014 16:36:52 +0200
Subject: [PATCH] =?UTF-8?q?[fix]=C2=A0debian=20debconf=20settings=20for=20?=
 =?UTF-8?q?mysql=20:=20read=20from=20/etc/alternc/my.cnf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/alternc.config | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/alternc.config b/debian/alternc.config
index 3ebfccf9..8454b5d0 100644
--- a/debian/alternc.config
+++ b/debian/alternc.config
@@ -105,6 +105,13 @@ QUEST_STATE=1
 while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do
   case "$QUEST_STATE" in
   1)
+	if [ -r /etc/alternc/my.cnf ]; then  
+		MYSQL_USER=$(cat /etc/alternc/my.cnf |grep "^user"|sed -r 's/user="(.*)"/\1/');  
+		MYSQL_PASSWORD=$(cat /etc/alternc/my.cnf |grep "^password"|sed -r 's/password="(.*)"/\1/'); 
+		MYSQL_DATABASE=$(cat /etc/alternc/my.cnf |grep "^database"|sed -r 's/database="(.*)"/\1/'); 
+		MYSQL_HOST=$(cat /etc/alternc/my.cnf |grep "^host"|sed -r 's/host="(.*)"/\1/'); 
+	fi
+
     if [ -r /etc/alternc/local.sh ]; then
       # source the current config
       . /etc/alternc/local.sh
@@ -121,10 +128,6 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 14 ]; do
       db_set alternc/alternc_logs "$ALTERNC_LOGS"
       db_set alternc/monitor_ip "$MONITOR_IP"
       db_set alternc/default_mx2 "$DEFAULT_SECONDARY_MX"
-      db_set alternc/mysql/host "$MYSQL_HOST"
-      db_set alternc/mysql/db "$MYSQL_DATABASE"
-      db_set alternc/mysql/user "$MYSQL_USER"
-      db_set alternc/mysql/password "$MYSQL_PASS"
       db_set alternc/mysql/client "$MYSQL_CLIENT"
       db_set alternc/sql/backup_type "$SQLBACKUP_TYPE"
       db_set alternc/sql/backup_overwrite "$SQLBACKUP_OVERWRITE"