* depend on ical >= 0.43

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

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index 25663616f114dec3bdf5fce8c75cedbf4ff0ad03..cdb7cdfed93e69e4f0c2e0afceedc46fc49aff9e 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -7,14 +7,20 @@ set -e
 . /usr/share/debconf/confmodule
 db_version 2.0
 
-# glitch: this mustn't be in /var/run/
-if test -f /var/run/refcount_adjustments.dat; then
-    mv /var/run/refcount_adjustments.dat /etc/citadel/
-fi
+move_file()
+{
+       [ ! -f $1 ] && return
+       [ -f $2 ] && return
+       mv -f $1 $2
+}
+
 case "$1" in
     configure)
         chown -R citadel:citadel /etc/citadel
         chown -R citadel:citadel /var/lib/citadel /var/spool/citadel
+       move_file /var/run/refcount_adjustments.dat /etc/citadel/data/refcount_adjustments.dat
+       move_file /etc/citadel/citadel.control /var/lib/citadel/data/citadel.control
+       move_file /etc/citadel/citadel.config /var/lib/citadel/data/citadel.config
 
         db_get citadel/Administrator && admin="$RET"
         db_get citadel/ServerIPAddress && ip_addr="$RET"
@@ -30,7 +36,7 @@ case "$1" in
         export CITADEL='/var/run/citadel'
        export CITADEL_PORT=504
         export CITADEL_INSTALLER=yes
-       export CITADEL_UID=`grep citadel /etc/passwd | cut -d :  -f 3`
+        export CITADEL_UID=`grep citadel /etc/passwd | cut -d :  -f 3`
         export ACT_AS_MTA=no
         export SYSADMIN_NAME=$admin
         export CREATE_XINETD_ENTRY=no