From 3df511aee90cd27aa7eb51040f524004a288bb06 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 20 Aug 2025 18:54:44 +0200
Subject: [PATCH] Changed constructor order. emails need to be defned before
 users

---
 tasks/stages/01_constructor.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tasks/stages/01_constructor.yml b/tasks/stages/01_constructor.yml
index 9f36c5f5..e514ec1a 100644
--- a/tasks/stages/01_constructor.yml
+++ b/tasks/stages/01_constructor.yml
@@ -4,6 +4,11 @@
     msg: "{{ allowed_applications }}"
   when: MODE_DEBUG | bool
 
+- name: Merge system_email definitions
+  set_fact:
+    SYSTEM_EMAIL: "{{ DEFAULT_SYSTEM_EMAIL | combine(system_email | default({}, true), recursive=True) }}"
+  no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
+
 - name: Merge variables
   block:
   - name: Merge users
@@ -11,11 +16,6 @@
       users: "{{ default_users | combine(users| default({}), recursive=True) }}"
     no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
 
-  - name: Merge system_email definitions
-    set_fact:
-      SYSTEM_EMAIL: "{{ DEFAULT_SYSTEM_EMAIL | combine(system_email | default({}, true), recursive=True) }}"
-    no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
-
   - name: Merge application definitions
     set_fact:
       applications: "{{ defaults_applications | merge_with_defaults(applications | default({}, true)) }}"