From 5c6c92ab69d3fce8a744ab73ffb368c9287a23a1 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 15 Nov 2017 11:17:58 +0100 Subject: [PATCH] evoacme: install hooks in a loop --- evoacme/tasks/acme.yml | 24 ------------------------ evoacme/tasks/evoacme_hook.yml | 14 ++++++++++++++ evoacme/tasks/main.yml | 9 +++++++++ 3 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 evoacme/tasks/evoacme_hook.yml diff --git a/evoacme/tasks/acme.yml b/evoacme/tasks/acme.yml index 86f6cfcf..16417ca6 100644 --- a/evoacme/tasks/acme.yml +++ b/evoacme/tasks/acme.yml @@ -30,30 +30,6 @@ group: acme state: directory -- name: "Search for reload_apache hook" - command: "find {{ evoacme_hooks_dir }} -type f \\( -name 'reload_apache' -o -name 'reload_apache.*' \\)" - check_mode: no - register: find_apache_hook - -- name: "Copy reload_apache hook if missing" - copy: - src: "hooks/reload_apache" - dest: "{{ evoacme_hooks_dir }}/reload_apache" - mode: "0750" - when: find_apache_hook.stdout == "" - -- name: "Search for reload_nginx hook" - command: "find {{ evoacme_hooks_dir }} -type f \\( -name 'reload_nginx' -o -name 'reload_nginx.*' \\)" - check_mode: no - register: find_nginx_hook - -- name: "Copy reload_nginx hook if missing" - copy: - src: "hooks/reload_nginx" - dest: "{{ evoacme_hooks_dir }}/reload_nginx" - mode: "0750" - when: find_nginx_hook.stdout == "" - - name: Fix log dir's right file: path: "{{ evoacme_log_dir }}" diff --git a/evoacme/tasks/evoacme_hook.yml b/evoacme/tasks/evoacme_hook.yml new file mode 100644 index 00000000..200bcbc4 --- /dev/null +++ b/evoacme/tasks/evoacme_hook.yml @@ -0,0 +1,14 @@ +--- + +- name: "Search for {{ hook_name }} hook" + command: "find {{ evoacme_hooks_dir }} -type f \\( -name '{{ hook_name }}' -o -name '{{ hook_name }}.*' \\)" + check_mode: no + changed_when: False + register: _find_hook + +- name: "Copy {{ hook_name }} hook if missing" + copy: + src: "hooks/{{ hook_name }}" + dest: "{{ evoacme_hooks_dir }}/{{ hook_name }}" + mode: "0750" + when: _find_hook.stdout == "" diff --git a/evoacme/tasks/main.yml b/evoacme/tasks/main.yml index 6bc21a02..08bb980a 100644 --- a/evoacme/tasks/main.yml +++ b/evoacme/tasks/main.yml @@ -9,6 +9,15 @@ - include: acme.yml +- include: evoacme_hook.yml + vars: + hook_name: "{{ item }}" + with_items: + - reload_apache + - reload_nginx + - reload_dovecot + - reload_postfix + - include: conf.yml - include: scripts.yml