From 1a01abe9b91592ecb5d4ff6925266b65d029fb94 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 9 Nov 2017 15:02:47 +0100
Subject: [PATCH] ansible-playbooks/general#72 Go back to includes for main.yml
files
---
handlers/main.yml | 3 +--
tasks/main.yml | 8 +++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/handlers/main.yml b/handlers/main.yml
index 3ed7b34..cafbeb4 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,4 @@
---
# file: roles/letsencrypt/handler/main.yml
-- include_tasks: '../../haproxy/handlers/main.yml'
- tags: 'always'
+- include: '../../haproxy/handlers/main.yml'
diff --git a/tasks/main.yml b/tasks/main.yml
index 1fbb40f..be72d20 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,16 +20,14 @@
changed_when: false
tags: 'always'
- - include_tasks: install.yml
- tags: 'always'
+ - include: install.yml
- - include_tasks: cert.yml
+ - include: cert.yml
with_items: '{{ letsencrypt_certificates|default([]) }}'
loop_control:
loop_var: domain
- tags: 'always'
- - include_tasks: renew.yml
+ - include: renew.yml
when: letsencrypt_certs_available is defined and letsencrypt_certs_available.stat.exists and (proxy_active is not defined or proxy_active)
tags: 'renew'
--
GitLab