Compare commits

...

2 Commits

3 changed files with 10 additions and 6 deletions

View File

@@ -6,7 +6,11 @@
- name: Certbot - Build plugin list
set_fact:
_certbot_plugins_used: "{{ certbot_certs | map(attribute='plugin') | list | unique | map('format', certbot_plugins_package_prefix + '%s') | list }}"
_certbot_plugins_used: "{{ certbot_certs | map(attribute='plugin') | list | unique }}"
- name: Certbot - Map plugin names to package names
set_fact:
_certbot_plugins_used: "{{ [certbot_plugins_package_prefix] | product(_certbot_plugins_used) | map('join') | list }}"
- name: Certbot - Install extension packages
when:
@@ -31,4 +35,4 @@
name: "{{ certbot_timer_service }}"
state: started
enabled: true
when: certbot_timer_service
when: certbot_timer_service is defined

View File

@@ -2,8 +2,8 @@
- name: Certbot - Get OS specific vars
include_vars: "{{ item }}"
with_first_found:
- "os/{{ ansible_os_family }}/{{ ansible_distribution_major_version }}.yaml"
- "os/{{ ansible_os_family }}.yaml"
- "os/{{ ansible_facts['os_family'] }}/{{ ansible_facts['distribution_major_version'] }}.yaml"
- "os/{{ ansible_facts['os_family'] }}.yaml"
- name: Certbot - Install Certbot
ansible.builtin.import_tasks: install.yaml

View File

@@ -1,10 +1,10 @@
---
- name: Certbot - Add host FQDN if not already listed in certs
ansible.builtin.set_fact:
certbot_certs: "{{ certbot_certs + [{'hostname': ansible_fqdn}] }}"
certbot_certs: "{{ certbot_certs + [{'hostname': ansible_facts['fqdn']}] }}"
when:
- certbot_request_fqdn_cert
- certbot_certs | selectattr('hostname', 'equalto', ansible_fqdn) | list | length == 0
- certbot_certs | selectattr('hostname', 'equalto', ansible_facts['fqdn']) | list | length == 0
- name: Certbot - Request Certificate
ansible.builtin.include_tasks: cert.yaml