external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-03-24 19:07:23 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'chadfurman/master' into quota

Browse Source 
# Conflicts:
#	management/cli.py
#	management/daemon.py
#	management/mailconfig.py
#	management/templates/users.html
#	setup/bootstrap.sh
#	setup/mail-dovecot.sh
#	setup/mail-postfix.sh
#	setup/mail-users.sh
This commit is contained in:
downtownallday
2024-10-02 21:50:47 -04:00
parent 939d6f04c3 884c23d1b7
commit 44eaef1155
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
management/mailconfig.py
View File

@@ -1438,12 +1438,12 @@ def remove_mail_alias(address_utf8, env, do_kick=True, auto=None, ignore_if_not_
return return_status
def add_auto_aliases(aliases, env):
conn, c = open_database(env, with_connection=True)
c.execute("DELETE FROM auto_aliases")
for source, destination in aliases.items():
c.execute("INSERT INTO auto_aliases (source, destination) VALUES (?, ?)", (source, destination))
conn.commit()
# def add_auto_aliases(aliases, env):
# conn, c = open_database(env, with_connection=True)
# c.execute("DELETE FROM auto_aliases")
# for source, destination in aliases.items():
# c.execute("INSERT INTO auto_aliases (source, destination) VALUES (?, ?)", (source, destination))
# conn.commit()
def get_system_administrator(env):
return "administrator@" + env['PRIMARY_HOSTNAME']