[SCM] ciderwebmail Debian packaging branch, master, updated. debian/1.04_20120610-2-10-g8f10aa1

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 9257fedf6d17dab79b05187ee8ed65af2f54e2ef
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 11 21:42:19 2012 +0200

    Reorganize configfile to closer match upstream default file.

diff --git a/debian/etc/ciderwebmail.conf b/debian/etc/ciderwebmail.conf
index ef610c6..dd34527 100644
--- a/debian/etc/ciderwebmail.conf
+++ b/debian/etc/ciderwebmail.conf
@@ -1,12 +1,23 @@
 name CiderWebmail
-username_default_address 1
-language en
-root /usr/share/ciderwebmail/root
-home /usr/share/ciderwebmail
+
+#IMAP server to use. if you specify port 993
+#CiderWebmail will automatically use SSL
 <server>
-	port 143
 	host localhost
+	port 143
 </server>
+
+#default language for the frontend to use
+language en
+
+#use the username as default e-mail From address (unless the user
+#specifies a different mail address). enable this if your users login with
+#user at domain.tld as username
+username_default_address 0
+
 <Model::DB>
 	connect_info dbi:SQLite:/var/lib/ciderwebmail/user_settings.sql
 </Model::DB>
+
+root /usr/share/ciderwebmail/root
+home /usr/share/ciderwebmail

-- 
ciderwebmail Debian packaging