YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] differenciate email pattern and alias pattern. alias can match catch-all, email cannot

Browse source
This commit is contained in:
Julien Malik 2016-11-17 17:18:14 +01:00
parent 5604b0463a
commit d0c4cb5119
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
data/actionsmap/yunohost.yml
View file

@ -126,7 +126,7 @@ user:
ask: ask_email ask: ask_email
required: True required: True
pattern: &pattern_email pattern: &pattern_email
- !!str ".*@.+" - !!str ".+@.+"
- "pattern_email" - "pattern_email"
-p: -p:
full: --password full: --password
@ -249,11 +249,13 @@ alias:
authenticate: all authenticate: all
arguments: arguments:
alias: alias:
help: The unique email alias to create help: The unique alias to create
metavar: ALIAS metavar: ALIAS
extra: extra:
required: True required: True
pattern: *pattern_email pattern: &pattern_alias
- !!str ".*@.+"
- "pattern_alias"
-f: -f:
full: --mailforward full: --mailforward
help: List of email to forward to, separated by commas without space help: List of email to forward to, separated by commas without space
@ -272,6 +274,10 @@ alias:
arguments: arguments:
alias: alias:
help: Alias to update help: Alias to update
metavar: ALIAS
extra:
required: True
pattern: *pattern_alias
--add-mailforward: --add-mailforward:
help: List of mailforward addresses to add, separated by commas without space help: List of mailforward addresses to add, separated by commas without space
metavar: MAIL metavar: MAIL
@ -296,7 +302,7 @@ alias:
help: Alias to delete help: Alias to delete
metavar: ALIAS metavar: ALIAS
extra: extra:
pattern: *pattern_email pattern: *pattern_alias
### alias_info() ### alias_info()
info: info:
@ -309,6 +315,8 @@ alias:
alias: alias:
help: Alias to get information help: Alias to get information
metavar: ALIAS metavar: ALIAS
extra:
pattern: *pattern_alias
############################# #############################
# Domain # # Domain #