From d37d906ff5794fefb41545e300e3f0cdb2d12a63 Mon Sep 17 00:00:00 2001 From: Squidly Date: Thu, 31 Jul 2014 15:28:22 +0200 Subject: [PATCH] Fixes #1618 Updating dovecot configuration to account for disk space used by mails on the global disk space. --- etc/alternc/templates/dovecot/alternc-sql.conf | 6 ++++-- etc/alternc/templates/dovecot/conf.d/95_alternc.conf | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/etc/alternc/templates/dovecot/alternc-sql.conf b/etc/alternc/templates/dovecot/alternc-sql.conf index e4bad783..da617553 100644 --- a/etc/alternc/templates/dovecot/alternc-sql.conf +++ b/etc/alternc/templates/dovecot/alternc-sql.conf @@ -124,14 +124,16 @@ default_pass_scheme = MD5 # user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u' # user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u' # -user_query = SELECT userdb_home AS home, userdb_uid AS uid, 1998 AS gid, userdb_quota_rule AS quota_rule FROM dovecot_view WHERE user = '%u'; +user_query = SELECT userdb_home AS home, 1998 AS uid, userdb_gid AS gid, userdb_quota_rule AS quota_rule FROM dovecot_view WHERE user = '%u'; + # 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 # also have to return userdb fields in password_query prefixed with "userdb_" # string. For example: # -password_query = SELECT user, password, userdb_home, userdb_uid, 1998 AS userdb_gid,userdb_quota_rule FROM dovecot_view where user= '%u'; +password_query = SELECT user, password, userdb_home, 1998 AS userdb_uid, userdb_gid,userdb_quota_rule FROM dovecot_view where user= '%u'; + # Query to get a list of all usernames. #iterate_query = SELECT username AS user FROM users diff --git a/etc/alternc/templates/dovecot/conf.d/95_alternc.conf b/etc/alternc/templates/dovecot/conf.d/95_alternc.conf index 8cda78d0..5dcf7708 100644 --- a/etc/alternc/templates/dovecot/conf.d/95_alternc.conf +++ b/etc/alternc/templates/dovecot/conf.d/95_alternc.conf @@ -105,7 +105,7 @@ mail_privileged_group = vmail # to make sure that users can't log in as daemons or other system users. # Note that denying root logins is hardcoded to dovecot binary and can't # be done even if first_valid_uid is set to 0. -first_valid_uid = 2000 +first_valid_uid = 1998 last_valid_uid = 65000 # ----------------------------------------------------------------------------