From d9d2535be07acf52a50f54ee6957e44f2a5a1d86 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 16 Dec 2016 16:18:19 +0100 Subject: [PATCH] evoacme: better syntax --- evoacme/tasks/main.yml | 13 ++++++++++--- evoacme/tasks/webserver.yml | 6 ++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/evoacme/tasks/main.yml b/evoacme/tasks/main.yml index 25fcdebf..f6264b76 100644 --- a/evoacme/tasks/main.yml +++ b/evoacme/tasks/main.yml @@ -1,12 +1,19 @@ --- - include: tasks/certbot.yml + - include: tasks/acme.yml + - include: tasks/conf.yml + - include: tasks/scripts.yml + - include: tasks/webserver.yml + - include: tasks/apache.yml - when: sta.stat.isreg is defined and sta.stat.isreg == True + when: sta.stat.isreg is defined and sta.stat.isreg + - include: tasks/nginx.yml - when: stn.stat.isreg is defined and stn.stat.isreg == True + when: stn.stat.isreg is defined and stn.stat.isreg + - include: tasks/dhparam.yml - when: stn.stat.isreg is defined and stn.stat.isreg == True + when: stn.stat.isreg is defined and stn.stat.isreg diff --git a/evoacme/tasks/webserver.yml b/evoacme/tasks/webserver.yml index e628b674..b3f416df 100644 --- a/evoacme/tasks/webserver.yml +++ b/evoacme/tasks/webserver.yml @@ -1,8 +1,10 @@ --- - name: Determine Nginx presence - stat: path=/etc/nginx/nginx.conf + stat: + path: /etc/nginx/nginx.conf register: stn - name: Determine Apache presence - stat: path=/etc/apache2/apache2.conf + stat: + path: /etc/apache2/apache2.conf register: sta