mirror of
https://github.com/iredmail/iRedMail
synced 2026-06-08 14:51:59 +00:00
Don't use deprecated ldap attributes: storageBaseDirectory, mailMessageStore.
This commit is contained in:
@@ -79,8 +79,6 @@ uid: ${DOMAIN_ADMIN_NAME}
|
||||
givenName: ${DOMAIN_ADMIN_NAME}
|
||||
mail: ${DOMAIN_ADMIN_EMAIL}
|
||||
accountStatus: active
|
||||
storageBaseDirectory: ${STORAGE_BASE_DIR}
|
||||
mailMessageStore: ${STORAGE_NODE}/${DOMAIN_ADMIN_MAILDIR_HASH_PART}
|
||||
homeDirectory: ${DOMAIN_ADMIN_MAILDIR_FULL_PATH}
|
||||
mailQuota: 104857600
|
||||
userPassword: ${DOMAIN_ADMIN_PASSWD_HASH}
|
||||
|
||||
@@ -7,6 +7,6 @@ bind_pw = PH_LDAP_BINDPW
|
||||
search_base = PH_LDAP_BASEDN
|
||||
scope = sub
|
||||
query_filter = (&(objectClass=mailUser)(|(mail=%s)(&(enabledService=shadowaddress)(shadowAddress=%s)))(accountStatus=active)(!(domainStatus=disabled))(enabledService=mail)(enabledService=deliver))
|
||||
result_attribute= mailMessageStore
|
||||
result_attribute= homeDirectory
|
||||
result_format = %s/Maildir/
|
||||
debuglevel = 0
|
||||
|
||||
@@ -38,7 +38,6 @@ APPEND_TIMESTAMP_IN_MAILDIR = True
|
||||
# Get base directory and storage node.
|
||||
std = STORAGE_BASE_DIRECTORY.rstrip('/').split('/')
|
||||
STORAGE_NODE = std.pop()
|
||||
STORAGE_BASE = '/'.join(std)
|
||||
|
||||
# Hashed maildir: True, False.
|
||||
# Example:
|
||||
@@ -250,7 +249,6 @@ def ldif_mailuser(domain, username, passwd, cn, quota, groups=''):
|
||||
mailMessageStore = "%s/%s%s/" % (domain, username, TIMESTAMP_IN_MAILDIR)
|
||||
|
||||
homeDirectory = STORAGE_BASE_DIRECTORY + '/' + mailMessageStore
|
||||
mailMessageStore = STORAGE_NODE + '/' + mailMessageStore
|
||||
|
||||
_ldif = __attrs_ldif({
|
||||
'objectClass': ['inetOrgPerson', 'mailUser', 'shadowAccount', 'amavisAccount'],
|
||||
@@ -260,8 +258,6 @@ def ldif_mailuser(domain, username, passwd, cn, quota, groups=''):
|
||||
'cn': cn,
|
||||
'sn': username,
|
||||
'uid': username,
|
||||
'storageBaseDirectory': STORAGE_BASE,
|
||||
'mailMessageStore': mailMessageStore,
|
||||
'homeDirectory': homeDirectory,
|
||||
'accountStatus': 'active',
|
||||
'enabledService': ['internal', 'doveadm', 'lib-storage',
|
||||
|
||||
@@ -201,9 +201,7 @@ objectClass: amavisAccount
|
||||
objectClass: mailUser
|
||||
objectClass: top
|
||||
accountStatus: active
|
||||
storageBaseDirectory: ${STORAGE_BASE}
|
||||
homeDirectory: ${STORAGE_BASE_DIRECTORY}/${maildir}
|
||||
mailMessageStore: ${STORAGE_NODE}/${maildir}
|
||||
mail: ${MAIL}
|
||||
mailQuota: ${QUOTA}
|
||||
userPassword: ${PASSWD}
|
||||
|
||||
Reference in New Issue
Block a user