Skip to content

Commit 538c407

Browse files
committed
Leverage fullchain_dest from the acme_certificate module
This simplifies the role by not requiring custom tasks to create the full certificate chain. Signed-off-by: mprahl <mprahl@users.noreply.github.com>
1 parent dd205de commit 538c407

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,6 @@ Ansible 2.7+ is required for this role. If you are using an older version of Ans
5353
`{{ ler53_cert_common_name }}.crt`.
5454
* **ler53_csr_file_name** - the file name of the certificate signing request (CSR) being generated.
5555
This defaults to `{{ ler53_cert_common_name }}.csr`.
56-
* **ler53_intermediate_download** - whether or not the Let's Encrypt intermediate CA should be
57-
downloaded. This defaults to `true`.
58-
* **ler53_intermediate_download_url** - the URL to download the Let's Encrypt intermediate CA. This
59-
defaults to `https://letsencrypt.org/certs/lets-encrypt-r3.pem`.
6056
* **ler53_intermediate_file_name** - the file name of the intermediate CA downloaded from Let's
6157
Encrypt. This defaults to `{{ ler53_cert_common_name }}.intermediate.pem`.
6258
* **ler53_cert_and_intermediate_file_name** - the name of the file created with the certificate and

defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ler53_cert_dir: "/etc/ssl/{{ ler53_cert_common_name }}"
1010
ler53_key_file_name: "{{ ler53_cert_common_name }}.key"
1111
ler53_cert_file_name: "{{ ler53_cert_common_name }}.crt"
1212
ler53_csr_file_name: "{{ ler53_cert_common_name }}.csr"
13-
ler53_intermediate_download: true
1413
ler53_intermediate_file_name: "{{ ler53_cert_common_name }}.intermediate.crt"
1514
ler53_cert_and_intermediate_file_name: "{{ ler53_cert_common_name }}.pem"
1615
ler53_cert_files_mode: 0600
@@ -23,4 +22,3 @@ ler53_account_key_file_name: lets_encrypt_account.key
2322
ler53_new_cert_when_csr_changes: false
2423
ler53_service_handlers: []
2524
ler53_acme_directory: https://acme-v02.api.letsencrypt.org/directory
26-
ler53_intermediate_download_url: https://letsencrypt.org/certs/lets-encrypt-r3.pem

tasks/main.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
data: "{{ lets_encrypt_challenge }}"
177177
remaining_days: "{{ ler53_cert_remaining_days_before_renewal }}"
178178
chain_dest: "{{ ler53_cert_dir }}/{{ ler53_intermediate_file_name }}"
179+
fullchain_dest: "{{ ler53_cert_dir }}/{{ ler53_cert_and_intermediate_file_name }}"
179180
notify: handle services
180181
register: lets_encrypt_validation_result
181182

@@ -205,23 +206,16 @@
205206
group: "{{ ler53_cert_files_group }}"
206207
mode: "{{ ler53_cert_files_mode }}"
207208

208-
- name: get content of the certificate
209-
command: "cat {{ ler53_cert_dir }}/{{ ler53_cert_file_name }}"
210-
register: ler53_certificate_content
211-
changed_when: false
212-
when: ler53_intermediate_download | bool
213-
214-
- name: get content of the intermediate CA
215-
command: "cat {{ ler53_cert_dir }}/{{ ler53_intermediate_file_name }}"
216-
register: ler53_intermediate_content
217-
changed_when: false
218-
when: ler53_intermediate_download | bool
219-
220-
- name: create a file with the certificate and intermediate CA concatenated
221-
copy:
222-
content: "{{ ler53_certificate_content['stdout'] + '\n' + ler53_intermediate_content['stdout'] + '\n' }}"
223-
dest: "{{ ler53_cert_dir }}/{{ ler53_cert_and_intermediate_file_name }}"
209+
- name: set the intermediate cert file permissions
210+
file:
211+
path: "{{ ler53_cert_dir }}/{{ ler53_intermediate_file_name }}"
212+
owner: "{{ ler53_cert_files_owner }}"
213+
group: "{{ ler53_cert_files_group }}"
214+
mode: "{{ ler53_cert_files_mode }}"
215+
216+
- name: set the full cert chain file permissions
217+
file:
218+
path: "{{ ler53_cert_dir }}/{{ ler53_cert_and_intermediate_file_name }}"
224219
owner: "{{ ler53_cert_files_owner }}"
225220
group: "{{ ler53_cert_files_group }}"
226221
mode: "{{ ler53_cert_files_mode }}"
227-
when: ler53_intermediate_download | bool

0 commit comments

Comments
 (0)