modified emailwiz.sh

1 files changed, 19 insertions, 28 deletions

diff --git a/emailwiz.sh b/emailwiz.sh
index ce7d64c..5c5bd03 100644
--- a/emailwiz.sh
+++ b/emailwiz.sh
@@ -239,6 +239,7 @@ protocols = \$protocols $allowed_protocols
 userdb {
 	driver = passwd
 }
+
 #Fallback: Use plain old PAM to find user passwords
 passdb {
 	driver = pam
@@ -250,38 +251,33 @@ mail_location = $mailbox_format:~/Mail:INBOX=~/Mail/Inbox:LAYOUT=fs
 namespace inbox {
 	inbox = yes
 	mailbox Drafts {
-	special_use = \\Drafts
-	auto = subscribe
-}
+    special_use = \\Drafts
+    auto = subscribe
+  }
 	mailbox Junk {
-	special_use = \\Junk
-	auto = subscribe
-	autoexpunge = 30d
-}
-  mailbox Spam {
-	special_use = \\Spam
-	auto = subscribe
-	autoexpunge = 7d
-}
+    special_use = \\Junk
+    auto = subscribe
+    autoexpunge = 30d
+  }
 	mailbox Sent {
-	special_use = \\Sent
-	auto = subscribe
-}
+    special_use = \\Sent
+    auto = subscribe
+  }
 	mailbox Trash {
-	special_use = \\Trash
-}
+    special_use = \\Trash
+  }
 	mailbox Archive {
-	special_use = \\Archive
-}
+    special_use = \\Archive
+  }
 }
 
 # Here we let Postfix use Dovecot's authentication system.
 service auth {
   unix_listener /var/spool/postfix/private/auth {
-	mode = 0660
-	user = postfix
-	group = postfix
-}
+    mode = 0660
+    user = postfix
+    group = postfix
+  }
 }
 
 protocol lda {
@@ -318,11 +314,6 @@ if header :contains \"X-Spam-Flag\" \"YES\" {
 	fileinto \"Junk\";
 }" >/var/lib/dovecot/sieve/default.sieve
 
-echo "require [\"fileinto\", \"mailbox\"];
-if header :contains \"X-Spam-Level\" \"***************\" {
-  fileinto \"Spam\";
-}" >>/var/lib/dovecot/sieve/default.sieve
-
 grep -q '^vmail:' /etc/passwd || useradd vmail
 chown -R vmail:vmail /var/lib/dovecot
 sievec /var/lib/dovecot/sieve/default.sieve