From 931de6408645a918a750b9e8f8e6f17d136edd9a Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 16 Dec 2016 16:17:14 +0100 Subject: [PATCH] evoacme: better validation for Apache --- evoacme/handlers/main.yml | 8 ++++---- evoacme/tasks/apache.yml | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/evoacme/handlers/main.yml b/evoacme/handlers/main.yml index e5538908..844cf8f7 100644 --- a/evoacme/handlers/main.yml +++ b/evoacme/handlers/main.yml @@ -1,11 +1,11 @@ - name: newaliases - shell: newaliases + command: newaliases - name: Test Apache conf shell: apache2ctl -t notify: "Reload Apache conf" -- name: Reload Apache conf +- name: reload apache2 service: - name=apache2 - state=reloaded + name: apache2 + state: reloaded diff --git a/evoacme/tasks/apache.yml b/evoacme/tasks/apache.yml index d0c3e478..532545ae 100644 --- a/evoacme/tasks/apache.yml +++ b/evoacme/tasks/apache.yml @@ -5,7 +5,8 @@ owner: root group: root mode: 0644 - notify: "Test Apache conf" + validate: apache2ctl -t + notify: reload apache2 - name: Enable acme challenge conf file: @@ -14,4 +15,5 @@ state: link owner: root group: root - notify: "Test Apache conf" + validate: apache2ctl -t + notify: reload apache2