inventory: template traefik_url

traefik: minor formatting
saltyorg · Feb 6, 2024 · 682a669 · 682a669
1 parent 1ebbd43
commit 682a669
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml
@@ -323,6 +323,12 @@ traefik_entrypoint_web: "{{ lookup('vars', traefik_role_var + '_traefik_entrypoi
 traefik_entrypoint_websecure_default: "{{ 'websecure' if not (lookup('vars', traefik_role_var + '_traefik_tailscale_enabled', default=false) | bool) else 'tailscale-websecure' }}"
 traefik_entrypoint_websecure: "{{ lookup('vars', traefik_role_var + '_traefik_entrypoint_websecure', default=traefik_entrypoint_websecure_default) }}"
 
+traefik_url: "{{ 'https://'
+                 + (lookup('vars', traefik_role_var + '_web_subdomain', default=lookup('vars', role_name + '_web_subdomain', default='')) + '.'
+                 + lookup('vars', traefik_role_var + '_web_domain', default=lookup('vars', role_name + '_web_domain', default=''))
+              if (lookup('vars', traefik_role_var + '_web_subdomain', default=lookup('vars', role_name + '_web_subdomain', default='')) | length > 0)
+              else lookup('vars', traefik_role_var + '_web_domain', default=lookup('vars', role_name + '_web_domain', default=''))) }}"
+
 ################################
 # Docker
 ################################

diff --git a/roles/traefik/defaults/main.yml b/roles/traefik/defaults/main.yml
@@ -207,11 +207,10 @@ traefik_docker_ports_tailscale_ipv6_defaults:
 traefik_docker_ports_custom: []
 traefik_docker_ports: "{{ (traefik_docker_ports_defaults
                           if not traefik_tailscale_enabled
-                          else
-                          traefik_docker_ports_tailscale_ipv4_defaults
-                          + (traefik_docker_ports_tailscale_ipv6_defaults
-                            if dns.ipv6
-                            else []))
+                          else traefik_docker_ports_tailscale_ipv4_defaults
+                               + (traefik_docker_ports_tailscale_ipv6_defaults
+                                 if dns.ipv6
+                                 else []))
                           + traefik_docker_ports_custom }}"
 
 # Envs
@@ -366,7 +365,7 @@ traefik_docker_hosts_default:
   host.docker.internal: "172.19.0.1"
 traefik_docker_hosts_custom: []
 traefik_docker_hosts: "{{ docker_hosts_common
-                          | combine(traefik_docker_hosts_default)
+                           | combine(traefik_docker_hosts_default)
                           | combine(traefik_docker_hosts_custom) }}"
 
 # Labels