diff options
author | Christian Pointner <equinox@spreadspace.org> | 2019-06-01 17:52:28 +0200 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2019-06-01 17:52:28 +0200 |
commit | 22d4ec550391e5e013e46347a908179b0c769ff3 (patch) | |
tree | fdb33ea899b753295e29f433d35cf77f8eee6464 /roles/acmetool | |
parent | fix cloud-install role (diff) | |
parent | with_dict -> loop (diff) |
Merge branch 'no-more-with'
Diffstat (limited to 'roles/acmetool')
-rw-r--r-- | roles/acmetool/base/tasks/selfsigned.yml | 6 | ||||
-rw-r--r-- | roles/acmetool/cert/tasks/main.yml | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/acmetool/base/tasks/selfsigned.yml b/roles/acmetool/base/tasks/selfsigned.yml index f5fb0466..7ba829e6 100644 --- a/roles/acmetool/base/tasks/selfsigned.yml +++ b/roles/acmetool/base/tasks/selfsigned.yml @@ -69,12 +69,12 @@ command: "cp '{{ tmpdir }}/cert' '{{ tmpdir }}/fullchain'" - name: create additional empty files + loop: + - chain + - selfsigned copy: content: "" dest: "{{ tmpdir }}/{{ item }}" - with_items: - - chain - - selfsigned ### TODO: remove this once acmetool respects it's own storage layout ### see: https://github.com/hlandau/acme/blob/master/_doc/SCHEMA.md#temporary-use-of-self-signed-certificates diff --git a/roles/acmetool/cert/tasks/main.yml b/roles/acmetool/cert/tasks/main.yml index ddb29236..c2f778f6 100644 --- a/roles/acmetool/cert/tasks/main.yml +++ b/roles/acmetool/cert/tasks/main.yml @@ -1,10 +1,10 @@ - name: add acmetool desired file + loop: + - satisfy: + names: "{{ acmetool_cert_hostnames | default([acmetool_cert_name]) }}" + loop_control: + label: "{{ item.satisfy.names | join(', ') }}" copy: content: "{{ item | to_nice_yaml }}" dest: "/var/lib/acme/desired/{{ acmetool_cert_name }}" - with_items: - - satisfy: - names: "{{ acmetool_cert_hostnames | default([acmetool_cert_name]) }}" - loop_control: - label: "{{ item.satisfy.names | join(', ') }}" notify: reconcile acmetool |