summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/vault.py
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2015-08-25 18:25:50 +0200
committerMartin Basti <mbasti@redhat.com>2015-08-26 10:56:28 +0200
commit19dd2ed758210e859a5b0085de558cf13ba09104 (patch)
treeac9bde9aeaa1d18bd2e7df8d2ac05cd725a902bc /ipalib/plugins/vault.py
parentaad73fad601f576dd83b758f4448839b4e8e87df (diff)
downloadfreeipa-19dd2ed758210e859a5b0085de558cf13ba09104.tar.gz
freeipa-19dd2ed758210e859a5b0085de558cf13ba09104.tar.xz
freeipa-19dd2ed758210e859a5b0085de558cf13ba09104.zip
vault: change default vault type to symmetric
https://fedorahosted.org/freeipa/ticket/5251 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipalib/plugins/vault.py')
-rw-r--r--ipalib/plugins/vault.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/ipalib/plugins/vault.py b/ipalib/plugins/vault.py
index 18436e399..483da5f0e 100644
--- a/ipalib/plugins/vault.py
+++ b/ipalib/plugins/vault.py
@@ -100,6 +100,7 @@ EXAMPLES:
Add a standard vault:
ipa vault-add <name>
[--user <user>|--service <service>|--shared]
+ --type standard
""") + _("""
Add a symmetric vault:
ipa vault-add <name>
@@ -310,7 +311,7 @@ class vault(LDAPObject):
label=_('Type'),
doc=_('Vault type'),
values=(u'standard', u'symmetric', u'asymmetric', ),
- default=u'standard',
+ default=u'symmetric',
autofill=True,
),
Bytes(
@@ -577,10 +578,14 @@ class vault_add(PKQuery, Local):
cli_name='desc',
doc=_('Vault description'),
),
- Str(
+ StrEnum(
'ipavaulttype?',
cli_name='type',
+ label=_('Type'),
doc=_('Vault type'),
+ values=(u'standard', u'symmetric', u'asymmetric', ),
+ default=u'symmetric',
+ autofill=True,
),
Str(
'password?',
@@ -608,7 +613,7 @@ class vault_add(PKQuery, Local):
def forward(self, *args, **options):
- vault_type = options.get('ipavaulttype', u'standard')
+ vault_type = options.get('ipavaulttype')
password = options.get('password')
password_file = options.get('password_file')
public_key = options.get('ipavaultpublickey')