From cd086acc82574f00cde06fabd5f4d7b9e1aaff1b Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Sun, 19 May 2019 22:50:00 +0200 Subject: [PATCH] fix some ansible 2.8 deprecation warnings --- tasks/install.yml | 6 +++--- tasks/main.yml | 4 ++-- tasks/nginx.yml | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tasks/install.yml b/tasks/install.yml index f9c3b13..3869161 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -39,13 +39,13 @@ copy: content: "{{ homeassistant_cmdline_content }}" dest: /boot/cmdline.txt - when: homeassistant_cmdline_override_enabled + when: homeassistant_cmdline_override_enabled | bool - name: Exclude serial devices from ModemManager template: src: "etc/udev/rules.d/99-mm-disable.rules.j2" dest: "/etc/udev/rules.d/99-mm-disable.rules" - when: homeassistant_exclude_modemmanager + when: homeassistant_exclude_modemmanager | bool notify: __udev_reload - name: Copy systemd unit file @@ -64,6 +64,6 @@ loop: "{{ homeassistant_open_ports }}" loop_control: label: "{{ item.name }}" - when: homeassistant_iptables_enabled + when: homeassistant_iptables_enabled | bool become: True become_user: root diff --git a/tasks/main.yml b/tasks/main.yml index afe66d2..985341a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,8 +2,8 @@ - import_tasks: prepare.yml - import_tasks: install.yml - import_tasks: tls.yml - when: homeassistant_tls_enabled + when: homeassistant_tls_enabled | bool tags: tls_renewal - import_tasks: nginx.yml - when: homeassistant_nginx_vhost_enabled + when: homeassistant_nginx_vhost_enabled | bool - import_tasks: post_tasks.yml diff --git a/tasks/nginx.yml b/tasks/nginx.yml index bb978ac..30110e0 100644 --- a/tasks/nginx.yml +++ b/tasks/nginx.yml @@ -12,7 +12,7 @@ label: "{{ item.dest }}" notify: __nginx_reload delegate_to: "{{ homeassistant_nginx_server }}" - when: homeassistant_nginx_tls_enabled + when: homeassistant_nginx_tls_enabled | bool become: True become_user: root tags: tls_renewal @@ -42,7 +42,9 @@ name: allow_homeassistant_nginx_proxy state: present rules: "-A OUTPUT -m state --state NEW -p tcp -d {{ homeassistant_nginx_proxy_url | urlsplit('hostname') }} --dport {{ homeassistant_nginx_proxy_url | urlsplit('port') }} -j ACCEPT" - when: homeassistant_nginx_iptables_enabled and (not homeassistant_nginx_server == inventory_hostname or not homeassistant_nginx_server == "localhost") + when: + - homeassistant_nginx_iptables_enabled | bool + - (not homeassistant_nginx_server == inventory_hostname or not homeassistant_nginx_server == "localhost") delegate_to: "{{ homeassistant_nginx_server }}" become: True become_user: root