diff --git a/tasks/unwant_domains.yml b/tasks/unwant_domains.yml index ffb7704..be31e53 100644 --- a/tasks/unwant_domains.yml +++ b/tasks/unwant_domains.yml @@ -2,8 +2,7 @@ - name: Disable acmetool for acme_domain_unwant_list domains become: true ansible.builtin.command: "acmetool unwant {{ _domain.name }}" - loop: - - "{{ acme_domain_unwant_list }}" + loop: "{{ acme_domain_unwant_list }}" loop_control: loop_var: _domain changed_when: true diff --git a/tasks/want_domains.yml b/tasks/want_domains.yml index 2348d94..f0e1f80 100644 --- a/tasks/want_domains.yml +++ b/tasks/want_domains.yml @@ -4,7 +4,6 @@ ansible.builtin.command: "acmetool want {{ _domain.name }}" args: creates: "/var/lib/acme/live/{{ _domain.name }}" - loop: - - "{{ acme_domain_want_list }}" loop_control: loop_var: _domain + loop: "{{ acme_domain_want_list }}" diff --git a/templates/acmetool_reload.j2 b/templates/acmetool_reload.j2 index 963d8fa..31c1ad9 100644 --- a/templates/acmetool_reload.j2 +++ b/templates/acmetool_reload.j2 @@ -3,8 +3,9 @@ # # reload hook configuration file # adding the service to the list of services to be reloaded by acmetool. -{% set services = '' %} +{% set services = ['$SERVICES'] %} {% for service in acme_reload_services %} -{% set _ = services.extend(' ' ~ service) %} +{% set _ = services.append(service) %} {% endfor %} -SERVICES="$SERVICES {{ services }}" +{% set services_string = services | join(' ') %} +SERVICES="{{ services_string }}" diff --git a/templates/acmetool_restart.j2 b/templates/acmetool_restart.j2 index 942356b..7467d92 100644 --- a/templates/acmetool_restart.j2 +++ b/templates/acmetool_restart.j2 @@ -3,8 +3,9 @@ # # restart hook configuration file # adding the service to the list of services to be restarted. -{% set services = '' %} +{% set services = ['$SERVICES'] %} {% for service in acme_restart_services %} -{% set _ = services.extend(' ' ~ service) %} +{% set _ = services.append(service) %} {% endfor %} -SERVICES="$SERVICES {{ services }}" +{% set services_string = services | join(' ') %} +SERVICES="{{ services_string }}" diff --git a/vars/main.yml b/vars/main.yml index 9c7bb40..b1d2664 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -33,5 +33,5 @@ acmetool__restart_hook: - 'files' # versionscheck -playbook_version_number: 35 # should be a integer +playbook_version_number: 36 # should be a integer playbook_version_path: 'do1jlr.role-acmetool.version'