From bff17f9de40dff44f6146f7a788408667d5a2e9a Mon Sep 17 00:00:00 2001 From: Rene Mewissen Date: Mon, 22 Jul 2024 15:51:13 +0200 Subject: [PATCH] make sure variables are defined before parsing value --- roles/database/tasks/main.yml | 8 ++++++-- roles/nameserver/tasks/main.yml | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/roles/database/tasks/main.yml b/roles/database/tasks/main.yml index 0b6d41c..3b3dd04 100644 --- a/roles/database/tasks/main.yml +++ b/roles/database/tasks/main.yml @@ -12,6 +12,10 @@ - mysql is defined - mysql == true - import_tasks: install_postgres.yml - when: postgres == true + when: + - postgres is defined + - postgres == true - import_tasks: install_redis.yml - when: redis == true \ No newline at end of file + when: + - redis is defined + - redis == true \ No newline at end of file diff --git a/roles/nameserver/tasks/main.yml b/roles/nameserver/tasks/main.yml index a277684..09ec9eb 100644 --- a/roles/nameserver/tasks/main.yml +++ b/roles/nameserver/tasks/main.yml @@ -6,7 +6,10 @@ - block: - include_tasks: install_unbound.yml - include_tasks: configure_unbound_snmpd.yml - when: unbound == true and powerdns_recursor != true + when: + - unbound is defined + - unbound == true + - powerdns is not defined or powerdns_recursor != true - name: nameserver | unbound | disable systemd-resolved include_tasks: disable-systemd-resolved.yml @@ -15,12 +18,18 @@ - block: - include_tasks: install_bind.yml - include_tasks: configure_bind_snmpd.yml - when: bind == true and powerdns_auth != true + when: + - bind is defined + - bind == true + - powerdns_auth is not defined or powerdns_auth != true - block: - include_tasks: install_powerdns_recursor.yml - include_tasks: configure_powerdns_recursor_snmpd.yml - when: powerdns_recursor == true and unbound != true + when: + - powerdns_recursor is defined + - powerdns_recursor == true + - unbound is not defined or unbound != true rescue: - set_fact: task_failed=true \ No newline at end of file