From 33890cacb183b69bf0032fd3dbd41b9c20cab4b1 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 12 Sep 2023 00:41:07 +0200
Subject: x509/certificates: generic config handling

---
 dan/sk-testvm.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'dan')

diff --git a/dan/sk-testvm.yml b/dan/sk-testvm.yml
index a004f9b5..33d237cd 100644
--- a/dan/sk-testvm.yml
+++ b/dan/sk-testvm.yml
@@ -30,6 +30,7 @@
       template: generic
       tls:
         certificate_provider: "{{ cert_provider }}"
+        certificate_config: "{{ lookup('vars', cert_provider+'_cert_config__default', default={}) }}"
         hsts: no
       hostnames:
       - testvm.elev8.at
@@ -37,15 +38,13 @@
         '/':
           root: /var/www/default
           index: index.html
-    static_cert_config: "{{ static_cert_config__default }}"
-    selfsigned_cert_config: "{{ selfsigned_cert_config__default }}"
-    ownca_cert_config: "{{ ownca_cert_config__default }}"
   - role: nginx/vhost
     nginx_vhost:
       name: test
       template: generic
       tls:
         certificate_provider: "{{ cert_provider }}"
+        certificate_config: "{{ lookup('vars', cert_provider+'_cert_config__test', default={}) }}"
         hsts: no
       hostnames:
       - test.spreadspace.org
@@ -56,9 +55,6 @@
         '/':
           root: /var/www/test
           index: index.html
-    static_cert_config: "{{ static_cert_config__test }}"
-    selfsigned_cert_config: "{{ selfsigned_cert_config__test }}"
-    ownca_cert_config: "{{ ownca_cert_config__test }}"
   # - role: apps/mumble
   #   mumble_version: v1.4.274-4
   #   mumble_instance: spreadspace
@@ -75,6 +71,7 @@
   #     rememberchannel: true
   #   mumble_tls:
   #     certificate_provider: "{{ cert_provider }}"
+  #     certificate_config: "{{ lookup('vars', cert_provider+'_cert_config__test', default={}) }}"
   # - role: apps/coturn
   #   coturn_version: 4.6.2-r4
   #   coturn_realm: spreadspace
@@ -86,6 +83,7 @@
   #   coturn_auth_secret: "somewhat-secret"
   #   coturn_tls:
   #     certificate_provider: "{{ cert_provider }}"
+  #     certificate_config: "{{ lookup('vars', cert_provider+'_cert_config__test', default={}) }}"
   post_tasks:
   - name: make sure document root directories exist
     loop:
-- 
cgit v1.2.3