ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 05:40:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allowing to write intermediate certificate into file. (#34328)

Browse source 
* Allowing to write intermediate certificate into file.

* Fixing merge errors introduced in 25b1db5 (#34916).
This commit is contained in:
Felix Fontein 2018-01-26 07:48:13 +01:00 • committed by ansibot
commit a69445e218
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,6 +131,13 @@ options:
- "Required if C(dest) is not specified." - "Required if C(dest) is not specified."
version_added: 2.5 version_added: 2.5
aliases: ['fullchain'] aliases: ['fullchain']
chain_dest:
description:
- If specified, the intermediate certificate will be written to this file.
required: false
default: null
aliases: ['chain']
version_added: 2.5
remaining_days: remaining_days:
description: description:
- "The number of days the certificate must have left being valid. - "The number of days the certificate must have left being valid.
@ -175,12 +182,13 @@ EXAMPLES = '''
# content: "{{ sample_com_challenge['challenge_data']['sample.com']['http-01']['resource_value'] }}" # content: "{{ sample_com_challenge['challenge_data']['sample.com']['http-01']['resource_value'] }}"
# when: sample_com_challenge is changed # when: sample_com_challenge is changed
- name: Let the challenge be validated and retrieve the cert - name: Let the challenge be validated and retrieve the cert and intermediate certificate
letsencrypt: letsencrypt:
account_key_src: /etc/pki/cert/private/account.key account_key_src: /etc/pki/cert/private/account.key
csr: /etc/pki/cert/csr/sample.com.csr csr: /etc/pki/cert/csr/sample.com.csr
dest: /etc/httpd/ssl/sample.com.crt dest: /etc/httpd/ssl/sample.com.crt
fullchain_dest: /etc/httpd/ssl/sample.com-fullchain.crt fullchain_dest: /etc/httpd/ssl/sample.com-fullchain.crt
chain_dest: /etc/httpd/ssl/sample.com-intermediate.crt
data: "{{ sample_com_challenge }}" data: "{{ sample_com_challenge }}"
### Example with DNS challenge against production ACME server ### ### Example with DNS challenge against production ACME server ###
@ -207,12 +215,14 @@ EXAMPLES = '''
# ttl: 60 # ttl: 60
# value: '"{{ item.value[challenge].resource_value }}"' # value: '"{{ item.value[challenge].resource_value }}"'
- name: Let the challenge be validated and retrieve the cert - name: Let the challenge be validated and retrieve the cert and intermediate certificate
letsencrypt: letsencrypt:
account_key_src: /etc/pki/cert/private/account.key account_key_src: /etc/pki/cert/private/account.key
account_email: myself@sample.com account_email: myself@sample.com
src: /etc/pki/cert/csr/sample.com.csr src: /etc/pki/cert/csr/sample.com.csr
cert: /etc/httpd/ssl/sample.com.crt cert: /etc/httpd/ssl/sample.com.crt
fullchain: /etc/httpd/ssl/sample.com-fullchain.crt
chain: /etc/httpd/ssl/sample.com-intermediate.crt
challenge: dns-01 challenge: dns-01
acme_directory: https://acme-v01.api.letsencrypt.org/directory acme_directory: https://acme-v01.api.letsencrypt.org/directory
remaining_days: 60 remaining_days: 60
@ -739,8 +749,9 @@ class ACMEClient(object):
self.version = module.params['acme_version'] self.version = module.params['acme_version']
self.challenge = module.params['challenge'] self.challenge = module.params['challenge']
self.csr = module.params['csr'] self.csr = module.params['csr']
self.dest = module.get('dest') self.dest = module.params.get('dest')
self.fullchain_dest = module.get('fullchain_dest') self.fullchain_dest = module.params.get('fullchain_dest')
self.chain_dest = module.params.get('chain_dest')
self.account = ACMEAccount(module) self.account = ACMEAccount(module)
self.directory = self.account.directory self.directory = self.account.directory
self.data = module.params['data'] self.data = module.params['data']
@ -1103,6 +1114,9 @@ class ACMEClient(object):
self.cert_days = get_cert_days(self.module, self.fullchain_dest) self.cert_days = get_cert_days(self.module, self.fullchain_dest)
self.changed = True self.changed = True
if self.chain_dest and write_file(self.module, self.chain_dest, ("\n".join(chain)).encode('utf8')):
self.changed = True
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
@ -1119,6 +1133,7 @@ def main():
data=dict(required=False, no_log=True, default=None, type='dict'), data=dict(required=False, no_log=True, default=None, type='dict'),
dest=dict(aliases=['cert'], type='path'), dest=dict(aliases=['cert'], type='path'),
fullchain_dest=dict(aliases=['fullchain'], type='path'), fullchain_dest=dict(aliases=['fullchain'], type='path'),
chain_dest=dict(required=False, default=None, aliases=['chain'], type='path'),
remaining_days=dict(required=False, default=10, type='int'), remaining_days=dict(required=False, default=10, type='int'),
), ),
required_one_of=( required_one_of=(