diff --git a/group_vars/all/00_general.yml b/group_vars/all/00_general.yml index c4d3c8b4..935305d1 100644 --- a/group_vars/all/00_general.yml +++ b/group_vars/all/00_general.yml @@ -13,7 +13,7 @@ primary_domain: "{{primary_domain_sld}}.{{primary_domain_tld}}" # Primar # Administrator administrator_username: "administrator" # Username of the administrator administrator_email: "{{administrator_username}}@{{primary_domain}}" # Email of the administrator -#user_administrator_initial_password: EXAMPLE_PASSWORD_123456 # Example initialisation password needs to be set in inventory file +#user_administrator_initial_password: EXAMPLE_PASSWORD_123456 # Example initialisation password needs to be set in inventory file # Test Email test_email: "test@{{primary_domain}}" diff --git a/playbook.constructor.yml b/playbook.constructor.yml index 106072ea..57414995 100644 --- a/playbook.constructor.yml +++ b/playbook.constructor.yml @@ -10,7 +10,12 @@ domains: "{{ defaults_domains | combine(domains | default({}, true), recursive=True) }}" - name: Merge redirect domain definitions set_fact: - redirect_domain_mappings: "{{ defaults_redirect_domain_mappings | combine(redirect_domain_mappings | default({}, true), recursive=True) }}" + merged_redirect_domain_mappings: >- + {{ + (defaults_redirect_domain_mappings | items2dict(key_name='source', value_name='target')) + | combine((redirect_domain_mappings | items2dict(key_name='source', value_name='target')), recursive=True) + | dict2items + }} - name: Merge application definitions set_fact: applications: "{{ defaults_applications | combine(applications | default({}, true), recursive=True) }}"