From 0ca33139b84c5704aaf8c9790e7f5f7b08c226f5 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Fri, 20 Jun 2025 09:51:58 +0200
Subject: [PATCH] Solved variable refence bugs

---
 group_vars/all/15_about.yml                           | 2 +-
 roles/docker-portfolio/lookup_plugins/docker_cards.py | 3 +++
 roles/docker-portfolio/tasks/main.yml                 | 7 ++++---
 roles/docker-portfolio/templates/config.yaml.j2       | 2 +-
 roles/nginx-serve-legal/templates/imprint.html.j2     | 2 +-
 tasks/plays/01_constructor.yml                        | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/group_vars/all/15_about.yml b/group_vars/all/15_about.yml
index 8db9d301..1a5b8cea 100644
--- a/group_vars/all/15_about.yml
+++ b/group_vars/all/15_about.yml
@@ -2,7 +2,7 @@
 defaults_service_provider:
   type:             "legal"                                                       # Accepted Values: natural, legal
   company:
-    titel:          "CyMaIS GbR"
+    titel:          "CyMaIS by Kevin Veen-Birkenbach"
     slogan:         "CyMaIS — Empowering a Sovereign Digital Future."
     address:
       street:       "Binary Avenue 01"
diff --git a/roles/docker-portfolio/lookup_plugins/docker_cards.py b/roles/docker-portfolio/lookup_plugins/docker_cards.py
index 5cf93512..02ed638a 100644
--- a/roles/docker-portfolio/lookup_plugins/docker_cards.py
+++ b/roles/docker-portfolio/lookup_plugins/docker_cards.py
@@ -114,5 +114,8 @@ class LookupModule(LookupBase):
 
             cards.append(card)
 
+        # Sort A-Z
+        cards.sort(key=lambda c: c['title'].lower())
+
         # Return the list of cards
         return [cards]
diff --git a/roles/docker-portfolio/tasks/main.yml b/roles/docker-portfolio/tasks/main.yml
index 5fbc611e..35c302bb 100644
--- a/roles/docker-portfolio/tasks/main.yml
+++ b/roles/docker-portfolio/tasks/main.yml
@@ -43,9 +43,10 @@
 - name: Debug portfolio data
   debug:
     msg:
-      portfolio_cards: "{{ portfolio_cards }}"
-      portfolio_menu_categories: "{{ portfolio_menu_categories}}"
-      portfolio_menu_data: "{{ portfolio_menu_data }}"
+      portfolio_cards:            "{{ portfolio_cards }}"
+      portfolio_menu_categories:  "{{ portfolio_menu_categories}}"
+      portfolio_menu_data:        "{{ portfolio_menu_data }}"
+      service_provider:           "{{ service_provider }}"
   when:
     - enable_debug | bool
     - run_once_docker_portfolio is not defined
diff --git a/roles/docker-portfolio/templates/config.yaml.j2 b/roles/docker-portfolio/templates/config.yaml.j2
index b57d2681..49c73984 100644
--- a/roles/docker-portfolio/templates/config.yaml.j2
+++ b/roles/docker-portfolio/templates/config.yaml.j2
@@ -93,7 +93,7 @@ platform:
     source: {{service_provider.platform.favicon}}
 company:
   titel: {{service_provider.company.titel}}
-  subtitel: {{service_provider.company.subtitel}}
+  subtitel: {{service_provider.company.slogan}}
   logo:
     source: {{service_provider.company.logo}}
   address:
diff --git a/roles/nginx-serve-legal/templates/imprint.html.j2 b/roles/nginx-serve-legal/templates/imprint.html.j2
index 7a0e7595..1295c22f 100644
--- a/roles/nginx-serve-legal/templates/imprint.html.j2
+++ b/roles/nginx-serve-legal/templates/imprint.html.j2
@@ -11,7 +11,7 @@
   <h2>Information in accordance with § 5 TMG</h2>
   <p>
     <strong>{{ service_provider.company.titel }}</strong><br>
-    {{ service_provider.company.subtitel }}<br>
+    {{ service_provider.company.slogan }}<br>
     <br>
     <strong>Address:</strong><br>
     {{ service_provider.company.address.street }}<br>
diff --git a/tasks/plays/01_constructor.yml b/tasks/plays/01_constructor.yml
index 70aeac09..c4146405 100644
--- a/tasks/plays/01_constructor.yml
+++ b/tasks/plays/01_constructor.yml
@@ -35,7 +35,7 @@
         {{ 
           defaults_applications | 
           canonical_domains_map(primary_domain) | 
-          combine(domains | default({}, true), recursive=True) 
+          combine(current_play_domains, recursive=True) 
         }}
 
   - name: Merge redirect_domain_mappings