mirror of
https://github.com/Mailu/Mailu.git
synced 2025-06-04 23:27:34 +02:00
Merge branch 'master' into fix_fetches_create
This commit is contained in:
commit
06457e9617
@ -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
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
|
@ -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)
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user