cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

letsencrypt: update agreement default to newest gathered

Browse source
This commit is contained in:
Rene Moser 2017-11-18 17:24:50 +01:00 • committed by Brian Coca
parent ddaf8673b9
commit c64eed16fe
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/web_infrastructure/letsencrypt.py
View file

@ -61,7 +61,7 @@ options:
description: description:
- "URI to a terms of service document you agree to when using the - "URI to a terms of service document you agree to when using the
ACME service at C(acme_directory)." ACME service at C(acme_directory)."
default: 'https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf' - Default is latest gathered from C(acme_directory) URL.
challenge: challenge:
description: The challenge to be performed. description: The challenge to be performed.
choices: [ 'http-01', 'dns-01', 'tls-sni-02'] choices: [ 'http-01', 'dns-01', 'tls-sni-02']
@ -305,11 +305,12 @@ class ACMEAccount(object):
''' '''
def __init__(self, module): def __init__(self, module):
self.module = module self.module = module
self.agreement = module.params['agreement']
self.key = module.params['account_key'] self.key = module.params['account_key']
self.email = module.params['account_email'] self.email = module.params['account_email']
self.data = module.params['data'] self.data = module.params['data']
self.directory = ACMEDirectory(module) self.directory = ACMEDirectory(module)
self.agreement = module.params['agreement'] or self.directory['meta']['terms-of-service']
self.uri = None self.uri = None
self.changed = False self.changed = False
@ -791,7 +792,7 @@ def main():
account_key=dict(required=True, type='path'), account_key=dict(required=True, type='path'),
account_email=dict(required=False, default=None, type='str'), account_email=dict(required=False, default=None, type='str'),
acme_directory=dict(required=False, default='https://acme-staging.api.letsencrypt.org/directory', type='str'), acme_directory=dict(required=False, default='https://acme-staging.api.letsencrypt.org/directory', type='str'),
agreement=dict(required=False, default='https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf', type='str'), agreement=dict(required=False, type='str'),
challenge=dict(required=False, default='http-01', choices=['http-01', 'dns-01', 'tls-sni-02'], type='str'), challenge=dict(required=False, default='http-01', choices=['http-01', 'dns-01', 'tls-sni-02'], type='str'),
csr=dict(required=True, aliases=['src'], type='path'), csr=dict(required=True, aliases=['src'], type='path'),
data=dict(required=False, no_log=True, default=None, type='dict'), data=dict(required=False, no_log=True, default=None, type='dict'),