diff options
| author | Daniel Hagan <daniel@kickidle.com> | 2019-04-03 20:38:28 +0200 |
|---|---|---|
| committer | John R Barker <john@johnrbarker.com> | 2019-04-03 20:38:28 +0200 |
| commit | c11af3dbef98a69b4c6f8a23649631c463a8a430 (patch) | |
| tree | 2e3d78db2b26e8ee829489feeb636851196ae92c | |
| parent | Netbox interface.py (#53212) (diff) | |
| download | ansible-c11af3dbef98a69b4c6f8a23649631c463a8a430.tar.xz ansible-c11af3dbef98a69b4c6f8a23649631c463a8a430.zip | |
correct openssl rsa to genrsa in acme doc fragment (#54744)
* correct openssl rsa to genrsa in acme doc fragment
* acme_certificate.py - updated route53 example to include wait: yes
| -rw-r--r-- | lib/ansible/modules/crypto/acme/acme_certificate.py | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/doc_fragments/acme.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/ansible/modules/crypto/acme/acme_certificate.py b/lib/ansible/modules/crypto/acme/acme_certificate.py index f98af96db8..57447e82ce 100644 --- a/lib/ansible/modules/crypto/acme/acme_certificate.py +++ b/lib/ansible/modules/crypto/acme/acme_certificate.py @@ -266,6 +266,7 @@ EXAMPLES = r''' # type: TXT # ttl: 60 # state: present +# wait: yes # # Note: route53 requires TXT entries to be enclosed in quotes # value: "{{ sample_com_challenge.challenge_data['sample.com']['dns-01'].resource_value | regex_replace('^(.*)$', '\"\\1\"') }}" # when: sample_com_challenge is changed @@ -278,6 +279,7 @@ EXAMPLES = r''' # type: TXT # ttl: 60 # state: present +# wait: yes # # Note: item.value is a list of TXT entries, and route53 # # requires every entry to be enclosed in quotes # value: "{{ item.value | map('regex_replace', '^(.*)$', '\"\\1\"' ) | list }}" diff --git a/lib/ansible/plugins/doc_fragments/acme.py b/lib/ansible/plugins/doc_fragments/acme.py index f6eea0dd30..13bc01f95f 100644 --- a/lib/ansible/plugins/doc_fragments/acme.py +++ b/lib/ansible/plugins/doc_fragments/acme.py @@ -27,7 +27,7 @@ options: description: - "Path to a file containing the ACME account RSA or Elliptic Curve key." - - "RSA keys can be created with C(openssl rsa ...). Elliptic curve keys can + - "RSA keys can be created with C(openssl genrsa ...). Elliptic curve keys can be created with C(openssl ecparam -genkey ...). Any other tool creating private keys in PEM format can be used as well." - "Mutually exclusive with C(account_key_content)." |