Restructured server config

roles/web-svc-logout/config/main.yml

@@ -4,23 +4,24 @@ features:
   port-ui-desktop:  true
   javascript:       false
   logout:           false
-domains:
-  canonical:
-    - "logout.{{ primary_domain }}"
-csp:
-  flags:
-    style-src:
-      unsafe-inline: true
-    script-src-elem:
-      unsafe-inline: true
-  whitelist:
-    connect-src:
-      - "{{ web_protocol }}://*.{{ primary_domain }}"
-      - "{{ web_protocol }}://{{ primary_domain }}"
-    script-src-elem:
-      - https://cdn.jsdelivr.net
-    style-src:
-      - https://cdn.jsdelivr.net
-    frame-ancestors:
-      - "{{ web_protocol }}://<< defaults_applications[web-app-keycloak].domains.canonical[0] >>"
+server:
+  domains:
+    canonical:
+      - "logout.{{ primary_domain }}"
+  csp:
+    flags:
+      style-src:
+        unsafe-inline: true
+      script-src-elem:
+        unsafe-inline: true
+    whitelist:
+      connect-src:
+        - "{{ web_protocol }}://*.{{ primary_domain }}"
+        - "{{ web_protocol }}://{{ primary_domain }}"
+      script-src-elem:
+        - https://cdn.jsdelivr.net
+      style-src:
+        - https://cdn.jsdelivr.net
+      frame-ancestors:
+        - "{{ web_protocol }}://<< defaults_applications[web-app-keycloak].server.domains.canonical[0] >>"
 

roles/web-svc-logout/filter_plugins/domain_filters.py

@@ -31,7 +31,7 @@ class FilterModule(object):
                     continue
 
                 # use canonical domains list if present
-                domains_entry = config.get('domains', {}).get('canonical', [])
+                domains_entry = config.get('server', {}).get('domains', {}).get('canonical', [])
 
                 # normalize to a list of strings
                 if isinstance(domains_entry, dict):