2 files changed, 8 insertions, 20 deletions
diff --git a/templates/dovecot/dovecot-sql.conf.erb b/templates/dovecot/dovecot-sql.conf.erb
index d4162e2..1ddb76c 100644
--- a/templates/dovecot/dovecot-sql.conf.erb
+++ b/templates/dovecot/dovecot-sql.conf.erb
@@ -113,7 +113,7 @@ password_query = SELECT username AS user,password FROM mailbox WHERE username =
 #   user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u'
 #
 #user_query = SELECT home, uid, gid FROM users WHERE userid = '%u'
-user_query = SELECT maildir, 1001 AS uid, 1001 AS gid FROM mailbox WHERE username = '%u' AND active='1'
+user_query = SELECT maildir, 5000 AS uid, 5000 AS gid FROM mailbox WHERE username = '%u' AND active='1'
 
 # If you wish to avoid two SQL lookups (passdb + userdb), you can use
 # userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll
diff --git a/templates/dovecot/dovecot.conf.erb b/templates/dovecot/dovecot.conf.erb
index bf23127..f451673 100644
--- a/templates/dovecot/dovecot.conf.erb
+++ b/templates/dovecot/dovecot.conf.erb
@@ -851,7 +851,7 @@ auth default {
   # database (passwd usually), you can use static userdb.
   # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
   # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
-  passdb pam {
+  #passdb pam {
     # [blocking=yes] [session=yes] [setcred=yes]
     # [cache_key=<key>] [<service name>]
     #
@@ -884,7 +884,7 @@ auth default {
     #   args = session=yes *
     #   args = cache_key=%u dovecot
     #args = dovecot
-  }
+  #}
 
   # System users (NSS, /etc/passwd, or similiar)
   # In many systems nowadays this uses Name Service Switch, which is
@@ -952,14 +952,14 @@ auth default {
   # System users (NSS, /etc/passwd, or similiar). In many systems nowadays this
   # uses Name Service Switch, which is configured in /etc/nsswitch.conf.
   # <doc/wiki/AuthDatabase.Passwd.txt>
-  userdb passwd {
+  #userdb passwd {
     # [blocking=yes] - By default the lookups are done in the main dovecot-auth
     # process. This setting causes the lookups to be done in auth worker
     # proceses. Useful with remote NSS lookups that may block.
     # NOTE: Be sure to use this setting with nss_ldap or users might get
     # logged in as each others!
     #args = 
-  }
+  #}
 
   # passwd-like file with specified location
   # <doc/wiki/AuthDatabase.PasswdFile.txt>
@@ -969,7 +969,7 @@ auth default {
   #}
 
   # static settings generated from template <doc/wiki/UserDatabase.Static.txt>
-  userdb static {
+  #userdb static {
     # Template for the fields. Can return anything a userdb could normally
     # return. For example:
     #
@@ -983,8 +983,8 @@ auth default {
     # the args in which case the passdb lookup is skipped.
     #
     #args =
-    args = uid=5000 gid=5000 home=/var/mail/virtual/%u allow_all_users=yes
-  }
+    #args = uid=5000 gid=5000 home=/var/mail/virtual/%u allow_all_users=yes
+  #}
 
   # SQL database <doc/wiki/AuthDatabase.SQL.txt>
   userdb sql {
@@ -1056,18 +1056,6 @@ auth default {
       group = postfix
     }
   }
-
-  ## dovecot-lda specific settings
-  ##
-  # socket listen {
-  #   master {
-  #     path = /var/run/dovecot/auth-master
-  #     mode = 0600
-  #     user = mail # User running Dovecot LDA
-  #     #group = mail # Or alternatively mode 0660 + LDA user in this group
-  #   }
-  # }
-
 }
 
 # If you wish to use another authentication server than dovecot-auth, you can