scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-10-31 10:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix_fetches_create

Browse Source
This commit is contained in:
Tim Möhlmann
2019-01-28 12:52:42 +02:00
committed by GitHub
parent 34b31727c4 77ec049edc
commit 06457e9617
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -10,7 +10,8 @@ v1.6.1 - unreleased
- Enhancement: Make Unbound drop privileges after binding to port - Enhancement: Make Unbound drop privileges after binding to port
- Enhancement: Create an Authentication Token with IPv6 address restriction ([#829](https://github.com/Mailu/Mailu/issues/829)) - Enhancement: Create an Authentication Token with IPv6 address restriction ([#829](https://github.com/Mailu/Mailu/issues/829))
- Bug: Fix creating new fetched accounts - Bug: Fix creating new fetched accounts
- - Enhancement: Missing wildcard option in alias flask command ([#869](https://github.com/Mailu/Mailu/issues/869))
v1.6.0 - 2019-01-18 v1.6.0 - 2019-01-18
------------------- -------------------

4
core/admin/mailu/manage.py
View File

@@ -292,8 +292,9 @@ def alias_delete(email):
@click.argument('localpart') @click.argument('localpart')
@click.argument('domain_name') @click.argument('domain_name')
@click.argument('destination') @click.argument('destination')
@click.option('-w', '--wildcard', is_flag=True)
@flask_cli.with_appcontext @flask_cli.with_appcontext
def alias(localpart, domain_name, destination): def alias(localpart, domain_name, destination, wildcard=False):
""" Create an alias """ Create an alias
""" """
domain = models.Domain.query.get(domain_name) domain = models.Domain.query.get(domain_name)
@@ -303,6 +304,7 @@ def alias(localpart, domain_name, destination):
alias = models.Alias( alias = models.Alias(
localpart=localpart, localpart=localpart,
domain=domain, domain=domain,
wildcard=wildcard,
destination=destination.split(','), destination=destination.split(','),
email="%s@%s" % (localpart, domain_name) email="%s@%s" % (localpart, domain_name)
) )