From ac34166557fe0e9fc3d9f6da3c7f90137ca4a497 Mon Sep 17 00:00:00 2001
From: "Daniel A. Maierhofer" <git@damadmai.at>
Date: Fri, 13 Jul 2018 15:26:27 +0200
Subject: [PATCH] Fix iptables-restore handler

---
 handlers/main.yml | 9 +++++++--
 tasks/apt.yml     | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index c6e4368..5d6b462 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -27,8 +27,13 @@
 - name: apt-get update
   apt: update_cache=yes
 
-- name: iptables restore
-  command: iptables-restore /etc/iptables/rules.v4 && ip6tables-restore /etc/iptables/rules.v6
+- name: iptables restore v4
+  listen: iptables restore
+  command: iptables-restore /etc/iptables/rules.v4
+
+- name: iptables restore v6
+  listen: iptables restore
+  command: ip6tables-restore /etc/iptables/rules.v6
 
 - name: snapper - reload fstab
   command: mount -a
diff --git a/tasks/apt.yml b/tasks/apt.yml
index 8f6b531..b7358fc 100644
--- a/tasks/apt.yml
+++ b/tasks/apt.yml
@@ -1,6 +1,6 @@
 ---
 - name: apt - add apt keys
-  apt_key: id="{{ item.id }}" url="{{ item.url }}" file="{{ item.file }}" state="{{ item.state }}"
+  apt_key: "id={{ item.id }} url={{ item.url }} file={{ item.file }} state={{ item.state }}"
   with_items: "{{ common_apt_keys }}"
 
 - name: apt - remove /etc/apt/sources.list.d/*
@@ -10,7 +10,7 @@
   file: path=/etc/apt/sources.list.d/ state=directory owner=root group=root mode=0755
 
 - name: apt - add repositories
-  apt_repository: repo="{{ item }}" update_cache=yes
+  apt_repository: "repo={{ item }} update_cache=yes"
   with_items: "{{ common_apt_repositories }}"
 
 - name: apt - remove /etc/apt/sources.list
@@ -22,9 +22,9 @@
   notify: apt-get update
 
 - name: install basic tools
-  apt: pkg="{{ item }}" cache_valid_time=3600 update_cache=yes
+  apt: "pkg={{ item }} cache_valid_time=3600 update_cache=yes"
   with_items: "{{ common_basic_packages }}"
 
 - name: apt - upgrade system
-  apt: upgrade="{{ common_apt_upgrade_policy }}"
+  apt: "upgrade={{ common_apt_upgrade_policy }}"
   when: common_apt_upgrade_policy