Changeset 1880

Timestamp:

08/23/07 10:24:15 (6 years ago)

Author:

benjamin

Message:

Now we use MYSQL_HOST in mysql.sh. Should work with remote mysqld. Updates #1013 (to be tested though)

Location:

alternc/trunk/install

Files:

• alternc.install (modified) (1 diff)
• mysql.sh (modified) (4 diffs)

alternc/trunk/install/alternc.install

@@ -156 +156 @@
 # Initialize database
 #
-if [ -e /usr/sbin/mysqld ]; then
+#if [ -e /usr/sbin/mysqld ]; then
     echo "Setup MySQL and database..."
-    /usr/share/alternc/install/mysql.sh "$MYSQL_USER" "$MYSQL_PASS" "$MYSQL_DATABASE"
-fi
+    /usr/share/alternc/install/mysql.sh "$MYSQL_HOST" "$MYSQL_USER" "$MYSQL_PASS" "$MYSQL_DATABASE"
+#fi
 
 ######################################################################## 

alternc/trunk/install/mysql.sh

@@ -30 +30 @@
 #
 
-rootlogin="$1"
-rootpass="$2"
-systemdb="$3"
+sqlserver="$1"
+rootlogin="$2"
+rootpass="$3"
+systemdb="$4"
 
 if [ -z "$rootlogin" -o -z "$rootpass" -o -z "$systemdb" ]
 then
-    echo "Usage: mysql.sh <rootlogin> <rootpass> <systemdb>"
+    echo "Usage: mysql.sh <mysqlserver> <rootlogin> <rootpass> <systemdb>"
     exit 1
 fi
 
-mysql="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf"
+mysql="/usr/bin/mysql --defaults-file=/etc/mysql/debian.cnf -h$sqlserver "
 
 if ! $mysql mysql -e "SHOW TABLES" >/dev/null
 then
     # is this an upgrade then?
-    mysql="/usr/bin/mysql -u$rootlogin -p$rootpass" 
+    mysql="/usr/bin/mysql -h$sqlserver -u$rootlogin -p$rootpass" 
     if ! $mysql mysql -e "SHOW TABLES" >/dev/null
     then
@@ -61 +62 @@
 then
     echo "You are using mysql 5.0, so we try with root account and no password since debian-sys-maint doesn't work."
-    mysql="/usr/bin/mysql -uroot "
+    mysql="/usr/bin/mysql -h$sqlserver -uroot "
     echo "Granting users "
     $mysql -e "GRANT ALL ON *.* TO '$rootlogin'@'${MYSQL_CLIENT}' IDENTIFIED BY '$rootpass' WITH GRANT OPTION"
@@ -72 +73 @@
 
 # Now we can use rootlogin and rootpass. 
-mysql="/usr/bin/mysql -u$rootlogin -p$rootpass" 
+mysql="/usr/bin/mysql -h$sqlserver -u$rootlogin -p$rootpass" 
 
 echo "Setting AlternC '$systemdb' system table and privileges "
@@ -80 +81 @@
 $mysql $systemdb < /usr/share/alternc/install/mysql.sql
 
-/usr/bin/mysql -u$rootlogin -p$rootpass $systemdb -e "SHOW TABLES" >/dev/null && echo "MYSQL.SH OK!" || echo "MYSQL.SH FAILED!"
+/usr/bin/mysql -h$sqlserver -u$rootlogin -p$rootpass $systemdb -e "SHOW TABLES" >/dev/null && echo "MYSQL.SH OK!" || echo "MYSQL.SH FAILED!"