mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-26 21:45:20 +02:00
Changed constructor order. emails need to be defned before users
This commit is contained in:
parent
c27d16322b
commit
3df511aee9
@ -4,6 +4,11 @@
|
|||||||
msg: "{{ allowed_applications }}"
|
msg: "{{ allowed_applications }}"
|
||||||
when: MODE_DEBUG | bool
|
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
|
- name: Merge variables
|
||||||
block:
|
block:
|
||||||
- name: Merge users
|
- name: Merge users
|
||||||
@ -11,11 +16,6 @@
|
|||||||
users: "{{ default_users | combine(users| default({}), recursive=True) }}"
|
users: "{{ default_users | combine(users| default({}), recursive=True) }}"
|
||||||
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
|
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
|
- name: Merge application definitions
|
||||||
set_fact:
|
set_fact:
|
||||||
applications: "{{ defaults_applications | merge_with_defaults(applications | default({}, true)) }}"
|
applications: "{{ defaults_applications | merge_with_defaults(applications | default({}, true)) }}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user