+ correct FS-flags on citadel.co* on startup

[citadel.git] / citadel / debian / citadel-server.postinst

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index b14199e5ba8883504688e7cbbf0973e9328a1bf1..25663616f114dec3bdf5fce8c75cedbf4ff0ad03 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -27,7 +27,7 @@ case "$1" in
         fi
 
         export IP_ADDR=$ip_addr
-        export CITADEL=''
+        export CITADEL='/var/run/citadel'
        export CITADEL_PORT=504
         export CITADEL_INSTALLER=yes
        export CITADEL_UID=`grep citadel /etc/passwd | cut -d :  -f 3`
@@ -36,25 +36,49 @@ case "$1" in
         export CREATE_XINETD_ENTRY=no
         export CREATE_INITTAB_ENTRY=no
         export NO_INIT_SCRIPTS=yes
-set >/tmp/citsetup
-        echo "applying your settings."
-        /usr/lib/citadel-server/setup -q
 
+#This is not debian conformant, and uniq to the citadel.org debs.
+       export ALTER_ETC_SERVICES=yes
+#
+        if test -S /var/run/citadel/citadel.socket; then 
+            /usr/sbin/sendcommand "DOWN"
+        fi
+        while test -S /var/run/citadel/citadel.socket; do 
+            sleep 1
+        done
+       if test ! -f /var/lib/citadel/data/citadel.control -a -f /etc/citadel/citadel.control; then
+           mv /etc/citadel/citadel.control /var/lib/citadel/data/
+           mv /etc/citadel/citadel.config /var/lib/citadel/data/
+       fi
+
+        echo -n "applying your settings.... "
+        /usr/lib/citadel-server/setup -q
+       echo "done"
         # we're in a fresh install, so we send the welcome message.
         if test -z "$2"; then
-            export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
-            export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
-            export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt
-            export FROM=room_citadel_stats@uncensored.citadel.org
-            export TO=room_lobby
-            (
-                printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$SEPERATOR\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$SEPERATOR\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; 
-                cat $WELCOMETXT
-                printf "\r\n\r\n--$SEPERATOR\r\nContent-Type: text/html; charset=US-ASCII\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"
-                cat $WELCOMEHTML; 
-                printf "\r\n\r\n--$SEPERATOR--\r\n\r\n") | \
-                    /usr/sbin/citmail -bm -r "$FROM" "$TO"
-        fi
+           echo "migrating mail aliases from other mailers"
+           /usr/lib/citadel-server/migrate_aliases.sh /etc/citadel/mail.aliases
+           i=0;
+           while test ! -S /var/run/citadel/lmtp.socket -a "$i" -lt "10"; do
+               sleep 1
+               i=$(($i + 1))
+           done
+           if test -S /var/run/citadel/lmtp.socket ; then
+               echo "sending welcome mail"
+               export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
+               export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
+               export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt
+               export FROM=room_citadel_stats@uncensored.citadel.org
+               export TO=room_lobby
+               (
+                    printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$SEPERATOR\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$SEPERATOR\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; 
+                    cat $WELCOMETXT
+                    printf "\r\n\r\n--$SEPERATOR\r\nContent-Type: text/html; charset=US-ASCII\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"
+                    cat $WELCOMEHTML; 
+                    printf "\r\n\r\n--$SEPERATOR--\r\n\r\n") | \
+                       /usr/sbin/citmail -bm -r "$FROM" "$TO"
+            fi
+       fi
 
         if test -S /var/run/citadel/citadel.socket; then 
             /usr/sbin/sendcommand "DOWN"