1 files changed, 22 insertions, 36 deletions
diff --git a/roles/reverseproxy/templates/Caddyfile.j2 b/roles/reverseproxy/templates/Caddyfile.j2
index 86ce98c..753c63d 100644
--- a/roles/reverseproxy/templates/Caddyfile.j2
+++ b/roles/reverseproxy/templates/Caddyfile.j2
@@ -1,77 +1,63 @@
-{% for item in {{ ansible_hostname }}.static %}
-"{{ item }}" {
-    tls "{{ email }}"
+{% for item in domainhttps %}
+{{ item }} {
+    tls {{ email }}
     gzip
-    log "{{ item }}_access.log" {
+    log {{ item }}_access.log {
             rotate_size 1
             rotate_keep 10
     }
-    errors "{{ item }}_error.log" {
+    errors {{ item }}_error.log {
             rotate_size 1
             rotate_keep 10
     }
 }
 {% endfor %}
-{% for item in {{ ansible_hostname }}.redir %}
-"{{ item.1 }}" {
-    tls "{{ email }}"
-    gzip
-    log "{{ item.1 }}_access.log" {
-            rotate_size 1
-            rotate_keep 10
-    }
-    errors "{{ item.1 }}_error.log" {
-            rotate_size 1
-            rotate_keep 10
-    }
-    redir https://"{{ item.2 }}"{uri}
-}
 
 {% if outdoor is defined %}
-{% for item in public.static %}
-"{{ item }}" {
-    tls "{{ email }}"
+{% for item in publicstatic %}
+{{ item }} {
+    tls {{ email }}
     gzip
-    log "{{ item }}_access.log" {
+    log {{ item }}_access.log {
             rotate_size 1
             rotate_keep 10
     }
-    errors "{{ item }}_error.log" {
+    errors {{ item }}_error.log {
             rotate_size 1
             rotate_keep 10
     }
 }
 {% endfor %}
 
-{% for item in public.redir %}
-"{{ item.1 }}" {
-    tls "{{ email }}"
+{% for item in publicredir %}
+{{ item }} {
+    tls {{ email }}
     gzip
-    log "{{ item.1 }}_access.log" {
+    log {{ item }}_access.log {
             rotate_size 1
             rotate_keep 10
     }
-    errors "{{ item.1 }}_error.log" {
+    errors {{ item }}_error.log {
             rotate_size 1
             rotate_keep 10
     }
-    redir https://"{{ item.2 }}"{uri}
+    redir https://{{ redirection }}{uri}
 }
 {% endfor %}
 
-{% for item in public.reverse %}
-"{{ item }}" {
-    tls "{{ email }}"
+{% for item in publicreverse %}
+{{ item }} {
+    tls {{ email }}
     gzip
-    log "{{ item }}_access.log" {
+    log {{ item }}_access.log {
         rotate_size 1
         rotate_keep 10
     }
-    errors "{{ item }}_error.log" {
+    errors {{ item }}_error.log {
         rotate_size 1
         rotate_keep 10
     }
-    proxy / https://"{{ backendhost }}":"{{ backendport }}" {
+    proxy / https://{{ backendhost }}:{{ backendport }} {
         transparent
         insecure_skip_verify
         max_fails 60