From c8fa79eb7a70fc071547dd47d25c741cbde799ee Mon Sep 17 00:00:00 2001 From: "Glenn Y. Rolland" Date: Wed, 13 Apr 2016 00:07:35 +0200 Subject: [PATCH] Fix ansible conditions. --- defaults/main.yml | 1 - tasks/development.yml | 2 +- tasks/multimedia.yml | 2 +- tasks/network.yml | 2 +- tasks/security.yml | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 280eaec..071dd57 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,5 +15,4 @@ basesystem_task_security: false basesystem_task_shell: false basesystem_task_shopping: false basesystem_task_system: false -basesystem_task_shell: false diff --git a/tasks/development.yml b/tasks/development.yml index 1f5d0b7..82eec8f 100644 --- a/tasks/development.yml +++ b/tasks/development.yml @@ -43,7 +43,7 @@ - vim-gtk - kate - xutils - when: basesystem_task_development == true && basesystem_task_desktop == true + when: (basesystem_task_development == true) and (basesystem_task_desktop == true) - name: "Installing Haskell language" apt: > diff --git a/tasks/multimedia.yml b/tasks/multimedia.yml index 08b7181..b1720b4 100644 --- a/tasks/multimedia.yml +++ b/tasks/multimedia.yml @@ -18,5 +18,5 @@ - vlc - flashplugin-nonfree - pepperflashplugin-nonfree - when: basesystem_task_multimedia == true && basesystem_task_desktop == true + when: (basesystem_task_multimedia == true) and (basesystem_task_desktop == true) diff --git a/tasks/network.yml b/tasks/network.yml index 60fbc1c..ec19f9e 100644 --- a/tasks/network.yml +++ b/tasks/network.yml @@ -14,4 +14,4 @@ state=present with_items: - wireshark - when: basesystem_task_network == true && basesystem_task_desktop == true + when: (basesystem_task_network == true) and (basesystem_task_desktop == true) diff --git a/tasks/security.yml b/tasks/security.yml index ff47700..a9ab2b0 100644 --- a/tasks/security.yml +++ b/tasks/security.yml @@ -25,5 +25,5 @@ - keepassx # desktop & security - kpcli # desktop ?? & security - pwgen # desktop & security - when: basesystem_task_desktop == true && basesystem_task_security == true + when: (basesystem_task_desktop == true) and (basesystem_task_security == true)