mirror of
https://github.com/Mailu/Mailu.git
synced 2024-12-12 10:45:38 +02:00
Merge branch 'master' into admin_create_user_enhancement
This commit is contained in:
commit
9b65a6c862
@ -10,6 +10,7 @@ v1.6.1 - unreleased
|
||||
- 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: Automatically create admin user on container startup if given appropriate environment variables
|
||||
- Enhancement: Missing wildcard option in alias flask command ([#869](https://github.com/Mailu/Mailu/issues/869))
|
||||
|
||||
v1.6.0 - 2019-01-18
|
||||
-------------------
|
||||
|
@ -314,8 +314,9 @@ def alias_delete(email):
|
||||
@click.argument('localpart')
|
||||
@click.argument('domain_name')
|
||||
@click.argument('destination')
|
||||
@click.option('-w', '--wildcard', is_flag=True)
|
||||
@flask_cli.with_appcontext
|
||||
def alias(localpart, domain_name, destination):
|
||||
def alias(localpart, domain_name, destination, wildcard=False):
|
||||
""" Create an alias
|
||||
"""
|
||||
domain = models.Domain.query.get(domain_name)
|
||||
@ -325,6 +326,7 @@ def alias(localpart, domain_name, destination):
|
||||
alias = models.Alias(
|
||||
localpart=localpart,
|
||||
domain=domain,
|
||||
wildcard=wildcard,
|
||||
destination=destination.split(','),
|
||||
email="%s@%s" % (localpart, domain_name)
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user