# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1340828106 0
# Node ID b5bb7b34e8310524968e2b9b73b3540a90844a86
# Parent  b0165b7af7a361ef9e6db7d29f6f164819ea8050
Configure.Dovecot_2: Added configuration documentation for Dovecot_2 >= 2.0.

diff -r b0165b7af7a3 -r b5bb7b34e831 Configure.Dovecot_2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Configure.Dovecot_2	Wed Jun 27 20:15:06 2012 +0000
@@ -0,0 +1,204 @@
+# This document contains a minimal configuration for a vmm setup with
+# Dovecot v2.x.
+#
+# You could save this file as local.conf in the dovecot configuration directory
+# (commonly /etc/dovecot or /usr/local/etc/dovecot).
+# When you want to use this file as your configuration file for Dovecot, make
+# sure you have commented out the line "!include conf.d/*.conf". The last line
+# "!include_try local.conf" is sufficient.
+#
+# Otherwise you have to apply the following settings to the configuration files
+# in the conf.d directory.
+
+### 
+#  dovecot.conf
+###
+protocols = imap lmtp
+# uncomment if your users should be able to manage their sieve scripts
+#protocols = imap lmtp sieve
+
+# uncomment if you want to use the quota plugin
+#dict {
+#  quota = pgsql:/usr/local/etc/dovecot/dovecot-dict-sql.conf.ext
+#}
+
+###
+# conf.d/10-auth.conf
+###
+auth_mechanisms = plain login cram-md5
+passdb {
+  driver = sql
+  args = /usr/local/etc/dovecot/dovecot-sql.conf.ext
+}
+userdb {
+  driver = sql
+  args = /usr/local/etc/dovecot/dovecot-sql.conf.ext
+}
+#!include auth-system.conf.ext
+
+###
+# conf.d/10-mail.conf
+###
+first_valid_gid = 70000
+first_valid_uid = 70000
+mail_location = maildir:~/Maildir
+
+# uncomment if you want to use the quota plugin
+#mail_plugins = quota
+
+###
+# conf.d/10-master.conf
+###
+
+# if you don't want to use secure imap, you have to disable the imaps listener
+##service imap-login {
+##  inet_listener imaps {
+##    port = 0
+##  }
+##}
+
+service lmtp {
+  unix_listener /var/spool/postfix/private/dovecot-lmtp {
+    user = postfix
+    group = postfix
+    mode = 0600
+  }
+}
+
+service auth {
+  user = nobody
+  unix_listener auth-userdb {
+  }
+  unix_listener /var/spool/postfix/private/dovecot-auth {
+    user = postfix
+    group = postfix
+    mode = 0600
+  }
+}
+
+service auth-worker {
+  unix_listener auth-worker {
+    user = nobody
+    group = $default_internal_user
+    mode = 0660
+  }
+  user = nobody
+}
+
+service dict {
+  unix_listener dict {
+    # we need mode 0666, because we have a GID/domain and a UID/user
+    mode = 0666
+  }
+}
+
+###
+# conf.d/10-ssl.conf
+###
+# SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
+#ssl = yes
+
+ssl_cert = </etc/ssl/certs/dovecot.pem
+ssl_key = </etc/ssl/private/dovecot.pem
+
+# if you want to disable SSL/TLS, you have set 'ssl = no' and disable the
+# imaps listener in conf.d/10-master.conf
+
+###
+# conf.d/15-lda.conf
+###
+postmaster_address = postmaster@YOUR-DOMAIN.TLD
+recipient_delimiter = +
+protocol lda {
+  # uncomment if you want to use the quota plugin
+  #mail_plugins = $mail_plugins
+  # uncomment if you want to use the quota and sieve plugins
+  #mail_plugins = $mail_plugins sieve
+}
+
+###
+# conf.d/20-imap.conf
+###
+protocol imap {
+  # uncomment if you want to use the quota plugin
+  #mail_plugins = $mail_plugins imap_quota
+}
+
+###
+# conf.d/20-lmtp.conf
+###
+protocol lmtp {
+  # uncomment if you want to use the quota plugin
+  #mail_plugins = $mail_plugins
+  # uncomment if you want to use the quota and sieve plugins
+  #mail_plugins = $mail_plugins sieve
+}
+
+###
+# conf.d/90-quota.conf
+###
+# uncomment if you want to use the quota plugin
+#plugin {
+#  quota = dict:user:%{uid}::proxy::quota
+#  quota_rule = *:storage=0:messages=0
+#  quota_rule2 = Trash:storage=+100M
+#}
+
+###
+# conf.d/90-sieve.conf
+###
+# uncomment if you want to use sieve (and maybe managesieve)
+#plugin {
+#  recipient_delimiter = +
+#  sieve = ~/.dovecot.sieve
+#  sieve_dir = ~/sieve
+#}
+
+###############################################################################
+#			    end of local configuration			      #
+###############################################################################
+
+
+###
+# etc/dovecot/dovecot-sql.conf.ext
+###
+# apply this settings to your dovecot-sql.conf.ext
+
+#driver = pgsql
+#connect = host=localhost dbname=mailsys user=dovecot password=$Dovecot_PASS
+#
+#password_query = \
+# SELECT userid AS "user", password FROM dovecotpassword('%Ln', '%Ld') WHERE %Ls
+#
+## uncomment this user_query if you want to use the quota plugin
+#user_query = \
+# SELECT home, uid, gid, mail, quota_rule FROM dovecotquotauser('%Ln', '%Ld')
+## otherwise uncomment the following user_query
+#user_query = SELECT home, uid, gid, mail FROM dovecotuser('%Ln', '%Ld')
+#
+#iterate_query = \
+# SELECT local_part AS username, domain_name.domainname AS domain \
+#   FROM users \
+#        LEFT JOIN domain_data USING (gid) \
+#        LEFT JOIN domain_name USING (gid)
+
+
+###
+# etc/dovecot/dovecot-dict-sql.conf.ext
+###
+# if you want to use the quota plugin add this lines to your
+#  dovecot-dict-sql.conf.ext
+
+#connect = host=localhost dbname=mailsys user=dovecot password=$Dovecot_PASS
+#map {
+#  pattern = priv/quota/storage
+#  table = userquota
+#  username_field = uid
+#  value_field = bytes
+#}
+#map {
+#  pattern = priv/quota/messages
+#  table = userquota
+#  username_field = uid
+#  value_field = messages
+#}
diff -r b0165b7af7a3 -r b5bb7b34e831 install.sh
--- a/install.sh	Wed Jun 27 13:11:28 2012 +0000
+++ b/install.sh	Wed Jun 27 20:15:06 2012 +0000
@@ -16,7 +16,7 @@
 else
     MANDIR=${PREFIX}/man
 fi
-DOCS="ChangeLog COPYING INSTALL README"
+DOCS="ChangeLog Configure.Dovecot_2 COPYING INSTALL NEWS README"
 
 INSTALL_OPTS="-g 0 -o 0 -p"
 INSTALL_OPTS_CF="-b -m 0640 -g ${PF_GID} -o 0 -p"
diff -r b0165b7af7a3 -r b5bb7b34e831 upgrade.sh
--- a/upgrade.sh	Wed Jun 27 13:11:28 2012 +0000
+++ b/upgrade.sh	Wed Jun 27 20:15:06 2012 +0000
@@ -15,7 +15,7 @@
 else
     MANDIR=${PREFIX}/man
 fi
-DOCS="ChangeLog COPYING NEWS INSTALL README"
+DOCS="ChangeLog Configure.Dovecot_2 COPYING INSTALL NEWS README"
 
 INSTALL_OPTS="-g 0 -o 0 -p"