# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1236184459 0
# Node ID 096d75757ea053194a15db4dff0a245ed0564221
# Parent  992291a415ab3182d5ab6c00815c702099b32f18
Cyrus-imapd: set passwd for cyrus user

diff -r 992291a415ab -r 096d75757ea0 cyrus-imapd/receipt
--- a/cyrus-imapd/receipt	Wed Mar 04 15:01:26 2009 +0000
+++ b/cyrus-imapd/receipt	Wed Mar 04 16:34:19 2009 +0000
@@ -55,7 +55,7 @@
 	if ! grep -q cyrus $1/etc/passwd; then
 		echo -n "Adding user cyrus..."
 		chroot $1/ adduser cyrus -D -H -S -h /tmp
-		echo "cyrus:cyrus" | chpasswd > /dev/null
+		chroot $1/ echo "cyrus:cyrus" | chpasswd > /dev/null
 		status
 	fi
 	# addgroup mail if needed
diff -r 992291a415ab -r 096d75757ea0 cyrus-imapd/stuff/etc/init.d/cyrus-imapd
--- a/cyrus-imapd/stuff/etc/init.d/cyrus-imapd	Wed Mar 04 15:01:26 2009 +0000
+++ b/cyrus-imapd/stuff/etc/init.d/cyrus-imapd	Wed Mar 04 16:34:19 2009 +0000
@@ -21,15 +21,17 @@
       echo "$NAME already running."
       exit 1
     fi
-    dir=$(grep configdirectory /etc/imapd.conf | awk '{ print $2 }')
+    dir=$(grep ^configdirectory /etc/imapd.conf | awk '{ print $2 }')
     if [ -f $dir/mailboxes.db ]; then
       echo -n "Initialize $DESC: "
+      /usr/cyrus/bin/mkimap
       for i in user quota ; do
         for j in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do
           [ -d $dir/$i/$j ] || mkdir -p $dir/$i/$j
         done
       done
       chown -R cyrus:mail $dir
+      chmod 750 $dir
       su cyrus -c "/usr/cyrus/bin/ctl_cyrusdb -r"
       su cyrus -c "/usr/cyrus/bin/reconstruct"
       status