Changeset 588

Timestamp:

02/22/06 00:33:14 (7 years ago)

Author:

anarcat

Message:

[project @ alternc: changeset 2005-03-10 17:30:31 by benjamin]

• modif du bug dans config (PAS DE ECHO)

• resolution du bug du lancement multiple de config

• on vire le check de "ROOT_MAIL" de do_domaines.sh qui le fait plantouiller

Original author: benjamin
Date: 2005-03-10 17:30:31

Files:

• debian/config (modified) (2 diffs)
• src/do_domaines.sh (modified) (2 diffs)

debian/config

@@ -16 +16 @@
 if [ "$RET" = "false" ]; then
         exit -1
+        db_reset alternc/welcomeconfirm || true
+        db_fset alternc/welcomeconfirm "seen" "false" || true
 fi
 
@@ -37 +39 @@
       DATA_PART=/dev/hda
       fi
-  # XXX: local.sh also has those settings:
-  # ROOT_MAIL (??)
 fi
-  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/internal_ip $DEFAULT_IP
-  db_set alternc/public_ip $DEFAULT_IP
-  db_set alternc/default_mx $DEFAULT_MX
-  db_set alternc/data_part $DATA_PART
-  db_set alternc/desktopname $FQDN
 
+# We set the debconf vars only when they are UNSEEN !
+if db_fget alternc/mysql/host seen 
+    then
+    db_set alternc/mysql/host $MYSQL_HOST
+fi
+
+if db_fget alternc/mysql/db seen 
+    then
+    db_set alternc/mysql/db $MYSQL_DATABASE
+fi
+if db_fget alternc/mysql/use seen 
+    then
+    db_set alternc/mysql/user $MYSQL_USER
+fi
+if db_fget alternc/mysql/password seen 
+    then
+    db_set alternc/mysql/password $MYSQL_PASS
+fi
+if db_fget alternc/internal_ip seen 
+    then
+    db_set alternc/internal_ip $DEFAULT_IP
+fi
+if db_fget alternc/public_ip seen 
+    then
+    db_set alternc/public_ip $DEFAULT_IP
+fi
+if db_fget alternc/default_mx seen 
+    then
+    db_set alternc/default_mx $DEFAULT_MX
+fi
+if db_fget alternc/data_part seen 
+    then
+    db_set alternc/data_part $DATA_PART
+fi
+if db_fget alternc/desktopname seen 
+    then
+    db_set alternc/desktopname $FQDN
+fi
+
+# other method : which one is best, don't know ;) 
   db_get alternc/ns1 || true
   if [ -z "$RET" ]

src/do_domaines.sh

@@ -1 +1 @@
 #!/bin/ksh
 #
-# $Id: do_domaines.sh,v 1.10 2005/02/21 15:29:59 anarcat Exp $
+# $Id: do_domaines.sh,v 1.11 2005/03/10 17:30:31 benjamin Exp $
 # ----------------------------------------------------------------------
 # AlternC - Web Hosting System
@@ -102 +102 @@
 
 # On teste si les variables attendues sont renseignées :
-for variable in MYSQL_DATABASE MYSQL_USER MYSQL_PASS ROOT_MAIL DEFAULT_MX DEFAULT_IP ; do
+for variable in MYSQL_DATABASE MYSQL_USER MYSQL_PASS DEFAULT_MX DEFAULT_IP ; do
         var=""
         var=`set | $grep $variable | $grep -v variable`