Changeset 2189

Timestamp:

04/24/08 19:13:25 (5 years ago)

Author:

anarcat

Message:

use the new my.cnf configuration from 0.9.8

Location:

alternc-mailman/trunk/debian

Files:

• control (modified) (1 diff)
• postinst (modified) (2 diffs)
• postrm (modified) (2 diffs)

alternc-mailman/trunk/debian/control

@@ -11 +11 @@
 Section: admin
 Architecture: all
-Pre-Depends: alternc (>= 0.9.4)
+Pre-Depends: alternc (>= 0.9.8)
 Depends: mailman (>= 2.1), mysql-client, debconf, perl-suid
 Description: Mailman module for AlternC

alternc-mailman/trunk/debian/postinst

@@ -16 +16 @@
 
     echo "Installing mysql table"
-    mysql -u"$MYSQL_USER" -p"$MYSQL_PASS" -h"$MYSQL_HOST" "$MYSQL_DATABASE" \
-        < /usr/share/alternc/install/mailman.sql
+    mysql --defaults-file=/etc/alternc/my.cnf < /usr/share/alternc/install/mailman.sql
     
     # Install generated mailman configuration if it has not been modified since
@@ -48 +47 @@
                     mail='mailman-${kind}_${FQDN}', alias='\"| $MAILMAN_SCRIPT ${kind} mailman\"');" 
           done
-        ) | mysql -f -u"$MYSQL_USER" -p"$MYSQL_PASS" -h"$MYSQL_HOST" \
-              "$MYSQL_DATABASE" || true
+        ) | mysql -f --defaults-file=/etc/alternc/my.cnf || true
     fi
 

alternc-mailman/trunk/debian/postrm

@@ -1 +1 @@
 #!/bin/sh -e
 
-CONFIGFILE="/etc/alternc/local.sh"
+CONFIGFILE="/etc/alternc/my.cnf"
 MENUFILE="/etc/alternc/menulist.txt"
 
@@ -19 +19 @@
     if [ -e "$CONFIGFILE" -a -x "/usr/bin/mysql" ]; then
         . "$CONFIGFILE"
-        mysql -f -u"$MYSQL_USER" -p"$MYSQL_PASS" -h"$MYSQL_HOST" \
-              "$MYSQL_DATABASE" -e "DROP TABLE IF EXISTS mailman"
+        mysql -f --defaults-file=/etc/alternc/my.cnf -e "DROP TABLE IF EXISTS mailman"
     fi
     ;;