Changeset 1001

Timestamp:

04/14/06 23:31:40 (7 years ago)

Author:

joe

Message:

Renversement

Location:

trunk

Files:

• debian/postinst (modified) (3 diffs)
• install/upgrades/0.9.5.sh (modified) (1 diff)

trunk/debian/postinst

@@ -7 +7 @@
 
 CONFIGFILE="/etc/alternc/local.sh"
-MYSQLCONFIG="/etc/alternc/mysql.cnf"
 
 update_var() {
@@ -78 +77 @@
 DEFAULT_MX=""
 
-# Starting with 0.9.5, the MySQL configuration for the support scripts
-# is stored in /etc/alternc/mysql.cnf
+# MySQL configuration
 MYSQL_HOST=""
 MYSQL_DATABASE=""
@@ -124 +122 @@
     sed -e "$SED_SCRIPT" < $CONFIGFILE > $CONFIGFILE.tmp
     mv -f $CONFIGFILE.tmp $CONFIGFILE
-
-    cat > $MYSQLCONFIG.tmp <<EOF
-# This file is automatically generated
-# and will be overwritten on upgrade.
-[client]
-EOF
-    chown root:www-data $MYSQLCONFIG.tmp
-    chmod 640  $MYSQLCONFIG.tmp
-
-    db_get alternc/mysql/db
-    echo "database = $RET" >> $MYSQLCONFIG.tmp
-    db_get alternc/mysql/user
-    echo "user = $RET" >> $MYSQLCONFIG.tmp
-    db_get alternc/mysql/password
-    echo "pass = $RET" >> $MYSQLCONFIG.tmp
-    db_get alternc/mysql/host
-    echo "host = $RET" >> $MYSQLCONFIG.tmp
-
-    mv -f $MYSQLCONFIG.tmp $MYSQLCONFIG
 
     # forget the password

trunk/install/upgrades/0.9.5.sh

@@ -7 +7 @@
 chmod 640 /etc/postfix/my*
 rm -f /var/alternc/bureau/admin/adm_list2.php
-
-TMP=`mktemp`
-TMP2=`mktemp`
-
-if [ ! -e /etc/alternc/mysql.cnf ]; then
-    grep '^MYSQL_.*$' /etc/alternc/local.sh | sed -e '1 i# This file is automatically generated\n# and will be overwritten on upgrade.\n[client]' -e '/^MYSQL_CLIENT.*$/ d' -e 's/"//g' -e 's/=/ = /g' -e 's/MYSQL_//g' -e 's/^[^=]*/\L\0/' > "$TMP"
-
-    chgrp www-data "$TMP"
-    chmod g+r "$TMP"
-    mv "$TMP" /etc/alternc/mysql.cnf
-fi
-
-sed -e 's/^# MySQL configuration$/# Starting with 0.9.5, the MySQL configuration for the support scripts\n# is stored in \/etc\/alternc\/mysql.cnf/' < /etc/alternc/local.sh > "$TMP2"
-chgrp www-data "$TMP2"
-chmod g+r "$TMP2"
-
-mv "$TMP2" /etc/alternc/local.sh