phase out hardy and dovecot1 configs for gentoo

templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot-sql.conf

@@ -3,3 +3,4 @@ connect = host=<SQL_HOST> dbname=<SQL_DB> user=<SQL_UNPRIVILEGED_USER> password=
 default_pass_scheme = CRYPT
 password_query = "SELECT username AS user, password_enc AS password, CONCAT(homedir, maildir) AS userdb_home, uid AS userdb_uid, gid AS userdb_gid, CONCAT('maildir:', homedir, maildir) AS userdb_mail, CONCAT('*:storage=', quota,'M') AS userdb_quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u') AND ((imap = 1 AND '%Ls' = 'imap') OR (pop3 = 1 AND '%Ls' = 'pop3') OR '%Ls' = 'smtp')"
 user_query = "SELECT CONCAT(homedir, maildir) AS home, CONCAT('maildir:', homedir, maildir) AS mail, uid, gid, CONCAT('*:storage=', quota,'M') AS quota_rule FROM mail_users WHERE (username = '%u' OR email = '%u')"
+iterate_query = "SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3 = 1)"

templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf

@@ -1,72 +1,65 @@
-base_dir = /var/run/dovecot
-protocols = imap pop3 <SSLPROTOCOLS>
+auth_mechanisms = plain login
+## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
+disable_plaintext_auth = no
 listen = *
 mail_access_groups = vmail
 mail_debug = no
-## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
-disable_plaintext_auth = no
+
+protocols = imap pop3
 
 ### SSL Settings
-### After setting this options, set disable_plaintext_auth to yes (see above)
-### and add imaps pop3s to the protocols
-#ssl_cert_file = /etc/ssl/server/<SERVERNAME>.pem
-#ssl_key_file = /etc/ssl/server/<SERVERNAME>.key
-## This is an example with CACerts class3 cert!
-#ssl_ca_file = /path/to/cacert.class3.crt
-#ssl_cipher_list = ALL:!LOW:!SSLv2
+### After you obtained an SSL-certificate enable ssl here and 
+### set disable_plaintext_auth to yes (see above)
+ssl = no
+#ssl_cert = </etc/ssl/server/<SERVERNAME>.pem
+#ssl_key = </etc/ssl/server/<SERVERNAME>.key
+
+passdb {
+	args = /etc/dovecot/dovecot-sql.conf
+	driver = sql
+}
+
+plugin {
+	quota = maildir:User Quota
+}
+
+service auth {
+	unix_listener /var/spool/postfix/private/auth {
+		group = postfix
+		mode = 0660
+		user = postfix
+	}
+	unix_listener auth-master {
+		group = vmail
+		mode = 0660
+		user = vmail
+	}
+}
+
+userdb {
+	driver = prefetch
+}
+
+userdb {
+	args = /etc/dovecot/dovecot-sql.conf
+	driver = sql
+}
 
 protocol imap {
 	mail_plugins = quota imap_quota
 }
 
 protocol pop3 {
-    # leave this uncommented if you are migrating from Courier also see Migration from Courier
-    pop3_uidl_format = UID%u-%v
-    mail_plugins = quota
-    
-}
-protocol lda {
-	# postmaster is the one in charge of the mail system. MUST be set to a valid address!
-    postmaster_address = admin@<SERVERNAME>
-    auth_socket_path = /var/run/dovecot/auth-master
-    mail_plugins = quota
-    sendmail_path = /usr/sbin/sendmail
+	mail_plugins = quota
+	pop3_uidl_format = UID%u-%v
 }
 
-auth default {
-    mechanisms = plain login
-    passdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    userdb prefetch {
-    }
-    
-    userdb sql {
-        args = /etc/dovecot/dovecot-sql.conf
-    }
-    
-    user = vmail
-    socket listen {
-    	# Postfix uses the client socket for SMTP Auth
-        client {
-            # Assuming the default Postfix $queue_directory setting
-            path = /var/spool/postfix/private/auth
-            mode = 0660
-            # Assuming the default Postfix user and group
-            user = postfix
-            group = postfix
-        }
-        # Note that we're setting a master socket. SMTP AUTH for Postfix and Exim uses client sockets.
-        master {
-			path = /var/run/dovecot/auth-master
-			mode = 0660
-			user = vmail
-			group = vmail
-    }
-        
-    }
-}
-plugin {
-	quota = maildir:User Quota
+lda_mailbox_autocreate = yes
+protocol lda {
+	auth_socket_path = /var/run/dovecot/auth-master
+	mail_plugins = quota
+	# postmaster is the one in charge of the mail system. MUST be set to a valid address!
+	postmaster_address = admin@<SERVERNAME>
+	sendmail_path = /usr/sbin/sendmail
+	lda_mailbox_autocreate = 1
 }