From 15e89220dd1f4ed02fb1d9061eb867f5fbe75921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 22 May 2019 10:08:05 -0400 Subject: [PATCH] remove handlers, since they mess with order of operations for bootstrap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- handlers/main.yml | 9 --------- tasks/config.yml | 2 -- tasks/firewall.yml | 9 +++------ 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 handlers/main.yml diff --git a/handlers/main.yml b/handlers/main.yml deleted file mode 100644 index 3e1a4b8..0000000 --- a/handlers/main.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: restart tinc - service: - name: 'tinc@{{ tinc_network_name }}' - state: restarted - enabled: true - -- name: Save iptables rules - shell: iptables-save > /etc/iptables/rules.v4 diff --git a/tasks/config.yml b/tasks/config.yml index 4c404c0..e1ea8a6 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -29,8 +29,6 @@ tags: ['role::tinc', 'role::tinc:config'] command: '{{ tinc_network_path }}/tinc-refresh' register: generation - notify: - - restart tinc - name: Configure a cron job to refresh Tinc peers tags: ['role::tinc', 'role::tinc:config'] diff --git a/tasks/firewall.yml b/tasks/firewall.yml index 966e9cc..189c15f 100644 --- a/tasks/firewall.yml +++ b/tasks/firewall.yml @@ -7,8 +7,6 @@ chain: INPUT jump: ACCEPT in_interface: tun0 - notify: - - Save iptables rules - name: Enable VPN connections for Docker tags: ['role::tinc', 'role::tinc:firewall'] @@ -18,8 +16,6 @@ comment: VPN connections in_interface: tun0 jump: ACCEPT - notify: - - Save iptables rules - name: Enable various service ports tags: ['role::tinc', 'role::tinc:firewall'] @@ -33,5 +29,6 @@ with_items: - { "port": 655, "cmt": "Tinc VPN TCP" } - { "port": 655, "cmt": "Tinc VPN UDP", "prot": "udp" } - notify: - - Save iptables rules + +- name: Save iptables rules + shell: iptables-save > /etc/iptables/rules.v4