Changeset 879

Timestamp:

03/15/06 16:19:15 (7 years ago)

Author:

benjamin

Message:

correcting ticket #566 taking globenet postinst + correcting default values computing + redirection of stderr during alternc.install/tar backup

Location:

trunk

Files:

• debian/config (modified) (2 diffs)
• debian/postinst (modified) (3 diffs)
• install/alternc.install (modified) (1 diff)

trunk/debian/config

@@ -7 +7 @@
 db_title AlternC
 
-db_reset alternc/welcomeconfirm || true
-db_fset alternc/welcomeconfirm "seen" "false" || true
-db_set alternc/welcomeconfirm "true" || true
+# We don't reset the welcomeconfirm seen flag.
+#db_reset alternc/welcomeconfirm || true
+#db_fset alternc/welcomeconfirm "seen" "false" || true
+#db_set alternc/welcomeconfirm "true" || true
 db_input critical alternc/welcomeconfirm || true
 
@@ -24 +25 @@
 MYSQL_DATABASE=alternc
 MYSQL_USER=sysusr
-MYSQL_PASS=`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..10)' `
-FQDN=`hostname -f`
-#INTERNAL_IP=`perl -e "print gethostbyname('$FQDN')"`
-INTERNAL_IP=`/sbin/ifconfig|grep "inet addr:" | grep -v 127.0.0.1| head -1 | sed -e 's/^.*addr:\([0-9\.]*\).*$/\1/'`
-DEFAULT_MX=`cat /etc/mailname`
-ALTERNC_LOC='/var/alternc'
-FQDN=`hostname -f`
+MYSQL_PASS="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..10)' `"
+FQDN="`cat /etc/mailname 2>/dev/null || cat /etc/hostname`"
+INTERNAL_IP="`/sbin/ifconfig|grep "inet addr:" | grep -v 127.0.0.1| head -1 | sed -e 's/^.*addr:\([0-9\.]*\).*$/\1/' 2>/dev/null || cat /etc/hostname`"
+PUBLIC_IP="$INTERNAL_IP"
+DEFAULT_MX="`cat /etc/mailname`"
+ALTERNC_LOC=/var/alternc
 NS1_HOSTNAME="$FQDN"
 NS2_HOSTNAME="$FQDN"
+HOSTING="AlternC"
 
 if [ -r /etc/alternc/local.sh ]; then

trunk/debian/postinst

@@ -93 +93 @@
     fi
 
-    for pair in \
-    "alternc/desktopname FQDN" \
-    "alternc/default_mx DEFAULT_MX" \
-    "alternc/alternc_location ALTERNC_LOC" \
-    "alternc/mysql/host MYSQL_HOST" \
-    "alternc/mysql/db MYSQL_DATABASE" \
-    "alternc/mysql/user MYSQL_USER" \
-    "alternc/mysql/password MYSQL_PASS" \
-    "alternc/public_ip DEFAULT_IP"
-    do
-      skip=0
-      for single in $pair
-      do
-        if [ "$skip" = "0" ]; then
-          db_get "$single" || true
-          skip=1
-        else
-          echo "$single=\"$RET\"" >> /etc/alternc/local.sh
-        fi
-      done
-    done
+    # Update local.sh
+    # 1. use cp to keep permissions
+    # 2. add missing variable to local.sh
+    # 3. use sed to set variables with current values
+    echo "Updating $CONFIGFILE"
+    cp -a -f $CONFIGFILE $CONFIGFILE.tmp
+    # SED_SCRIPT will be modified by update_var
+    SED_SCRIPT=""
+    update_var alternc/hostingname HOSTING
+    update_var alternc/desktopname FQDN 
+    update_var alternc/public_ip PUBLIC_IP
+    update_var alternc/internal_ip INTERNAL_IP
+    update_var alternc/monitor_ip MONITOR_IP
+    update_var alternc/ns1 NS1_HOSTNAME
+    update_var alternc/ns2 NS2_HOSTNAME
+    update_var alternc/bind_internal BIND_INTERNAL
+    update_var alternc/default_mx DEFAULT_MX 
+    update_var alternc/mysql/host MYSQL_HOST 
+    update_var alternc/mysql/db MYSQL_DATABASE 
+    update_var alternc/mysql/user MYSQL_USER 
+    update_var alternc/mysql/password MYSQL_PASS 
+    update_var alternc/alternc_location ALTERNC_LOC
+    update_var alternc/mynetwork SMTP_RELAY_NETWORKS
+    sed -e "$SED_SCRIPT" < $CONFIGFILE > $CONFIGFILE.tmp
+    mv -f $CONFIGFILE.tmp $CONFIGFILE
 
     # forget the password
@@ -134 +138 @@
     /usr/share/alternc/install/upgrade_check.sh $2
 
-    # important: postinst gele sans ca
-    db_stop
-
-    # ensure our run dir for saslauthd is present in Debian stat database
-    # (needed by /etc/init.d/saslauthd)
-    PWDIR=/var/spool/postfix/var/run/saslauthd
-    dpkg-statoverride --list $PWDIR 2>&1 >/dev/null ||
-        dpkg-statoverride --update --add root sasl 710 $PWDIR
-    
-    # postfix needs to be in the sasl group for saslauthd connection
-    adduser --quiet postfix sasl
-
     echo "config phpmyadmin"
     include_str='include_once("/etc/alternc/phpmyadmin.inc.php")'
@@ -153 +145 @@
     fi
 
-   if ! test -e /etc/apache-ssl/conf.d/phpmyadmin.conf; then
-      if test -e /etc/phpmyadmin/apache.conf; then
-                ln -s /etc/phpmyadmin/apache.conf /etc/apache-ssl/conf.d/phpmyadmin.conf
-      fi
-   fi
-
-   if ! test -e /etc/apache/conf.d/phpmyadmin.conf; then
-      if test -e /etc/phpmyadmin/apache.conf; then
-                ln -s /etc/phpmyadmin/apache.conf /etc/apache/conf.d/phpmyadmin.conf
-      fi
-   fi
-
-
-   if ! test -e /etc/apache-ssl/conf.d/squirrelmail.conf; then
-      if test -e /etc/squirrelmail/apache.conf; then
-                ln -s /etc/squirrelmail/apache.conf /etc/apache-ssl/conf.d/squirrelmail.conf
-      fi
-   fi
-
-   if ! test -e /etc/apache/conf.d/squirrelmail.conf; then
-      if test -e /etc/squirrelmail/apache.conf; then
-                ln -s /etc/squirrelmail/apache.conf /etc/apache/conf.d/squirrelmail.conf
-      fi
-   fi
-
-
-# Apache will not start without this file
-touch /var/alternc/apacheconf/override_php.conf
-
-   if ! test -e /etc/apache-ssl/conf.d/override_php.conf; then
-                ln -s /var/alternc/apacheconf/override_php.conf /etc/apache-ssl/conf.d/override_php.conf
-   fi
-
-
-   if ! test -e /etc/apache/conf.d/override_php.conf; then
-                ln -s /var/alternc/apacheconf/override_php.conf /etc/apache/conf.d/override_php.conf
-   fi
-
-
+    # important: postinst gele sans ca
+    db_stop
 
     echo "running alternc.install"

trunk/install/alternc.install

@@ -146 +146 @@
 done
 
-tar -zcf "$BACKUP_FILE" -C / $BACKUPS || true
+tar -zcf "$BACKUP_FILE" -C / $BACKUPS 2>/dev/null || true
 
 #######################################################################