From 8de911402fc332886522d073b903eec69483f342 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Fri, 19 May 2017 11:59:42 +0200
Subject: [PATCH] Simplify proxy certificates with letsencrypt, only define
them once
---
tasks/buildcerts.yml | 4 ++--
tasks/main.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tasks/buildcerts.yml b/tasks/buildcerts.yml
index 0a453a2..84a1325 100644
--- a/tasks/buildcerts.yml
+++ b/tasks/buildcerts.yml
@@ -6,7 +6,7 @@
src='/etc/letsencrypt/live/{{ item.domain }}'
dest='/etc/haproxy/certs/{{ item.domain }}.pem'
regexp='(fullchain)|(privkey)\.pem'
- with_items: '{{ proxy_certificates_letsencrypt|default([]) }}'
- when: item.active|default(true)
+ with_items: '{{ proxy_certificates|default([]) }}'
+ when: item.letsencrypt|default(false) and item.active|default(true)
notify:
- "Restart HAProxy"
diff --git a/tasks/main.yml b/tasks/main.yml
index 1eb9091..638f00b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,10 +17,10 @@
- name: "Install Certs"
include: '../../letsencrypt/tasks/cert.yml'
- with_items: '{{ proxy_certificates_letsencrypt|default([]) }}'
+ with_items: '{{ proxy_certificates|default([]) }}'
loop_control:
loop_var: domain
- when: domain.active|default(true)
+ when: domain.letsencrypt|default(false) and domain.active|default(true)
- name: "Renew Existing Cert"
include: '../../letsencrypt/tasks/renew.yml'
--
GitLab