external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-04 15:54:48 +01:00
Code Issues Releases Wiki Activity

Display and allow chaninging a comment/description for aliases. Change the default comment for required aliases to "Required alias".

Browse Source
This commit is contained in:
downtownallday
2020-08-25 12:00:55 -04:00
parent 2b981db1d9
commit 22bfef6f59
7 changed files with 85 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/migrate.py
View File

@@ -234,7 +234,7 @@ def migration_13(env):
# 4. perform the migration
users=m13.create_users(env, conn, ldap, ldap_base, ldap_users_base, ldap_domains_base)
aliases=m13.create_aliases(conn, ldap, ldap_aliases_base)
aliases=m13.create_aliases(env, conn, ldap, ldap_aliases_base)
permitted=m13.create_permitted_senders(conn, ldap, ldap_users_base, ldap_permitted_senders_base)
m13.populate_aliases(conn, ldap, users, aliases)

15
setup/migration_13.py
View File

@@ -107,7 +107,7 @@ def create_users(env, conn, ldapconn, ldap_base, ldap_users_base, ldap_domains_b
return users
def create_aliases(conn, ldapconn, aliases_base):
def create_aliases(env, conn, ldapconn, aliases_base):
# iterate through sqlite 'aliases' table and create ldap
# aliases but without members. returns a map of alias->dn
aliases={}
@@ -122,10 +122,19 @@ def create_aliases(conn, ldapconn, aliases_base):
else:
cn="%s" % uuid.uuid4()
dn="cn=%s,%s" % (cn, aliases_base)
print("adding alias %s" % alias)
description="Mail group %s" % alias
if alias.startswith("postmaster@") or \
alias.startswith("hostmaster@") or \
alias.startswith("abuse@") or \
alias.startswith("admin@") or \
alias == "administrator@" + env['PRIMARY_HOSTNAME']:
description = "Required alias"
print("adding alias %s" % alias)
ldapconn.add(dn, ['mailGroup'], {
"mail": alias,
"description": "Mail group %s" % alias
"description": description
})
aliases[alias] = dn
return aliases