From 1ddb7fa78d7324f68749ebbbbabd7609ab5ce1f4 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sun, 26 Apr 2020 11:57:17 +0200
Subject: [PATCH] extend existing certificate list instead of overwriting it.
 Ansible realy needs a deep merge...

---
 defaults/main.yml |  1 -
 meta/main.yml     |  1 -
 tasks/main.yml    | 10 ++++++++++
 vars/main.yml     |  3 ---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 2dbdaf6..b50c758 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,3 @@
-
 nginx:
   add_headers: []
   real_ip_from:
diff --git a/meta/main.yml b/meta/main.yml
index d4fb308..d8b62af 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,4 +1,3 @@
 ---
 dependencies:
   - { role: monitoring, when: nginx.monitoring }
-  - certificates
diff --git a/tasks/main.yml b/tasks/main.yml
index 7f2de40..4480696 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,4 +1,14 @@
 ---
+- set_fact:
+    nginx_certs: "{{ nginx.vhosts|nginx_vhosts_to_certificates }}"
+    inventory_certs: "{{ certificates.certs|d({}) }}"
+
+- include_role:
+    name: certificates
+  vars:
+    certificates:
+      certs: "{{ {}|combine(nginx_certs, inventory_certs, recursive=True) }}"
+
 - name: install nginx
   apt: pkg=nginx
   notify:
diff --git a/vars/main.yml b/vars/main.yml
index 5540178..8c06b43 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -3,6 +3,3 @@ monitoring:
   checks:
     local:
       nginx_status: {}
-
-certificates:
-  certs: "{{ nginx.vhosts|nginx_vhosts_to_certificates }}"