From 120072e0d58a86504558f9fbff09995fdc489848 Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <code@jannikbeyerstedt.de>
Date: Sun, 13 Feb 2022 20:42:31 +0100
Subject: [PATCH] [TIDY] move when statements

Having the when condition of a task at the top instead of bottom is
easiert to read.
---
 tasks/distribute.yml | 2 +-
 tasks/main.yml       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasks/distribute.yml b/tasks/distribute.yml
index be95ec2..00d3a1e 100644
--- a/tasks/distribute.yml
+++ b/tasks/distribute.yml
@@ -2,9 +2,9 @@
 # Tinc VPN Hostfile Distribution
 
 - name: Distribute - Set different base dir for macOS
+  when: (override_os_family is defined) | ternary(override_os_family,ansible_os_family) == "Darwin"
   ansible.builtin.set_fact:
     tinc_base_dir: /usr/local/etc/tinc
-  when: (override_os_family is defined) | ternary(override_os_family,ansible_os_family) == "Darwin"
 
 - name: Distribute - Copy hostfiles to targets
   become: yes
diff --git a/tasks/main.yml b/tasks/main.yml
index e4773f5..daf33b9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,9 +2,9 @@
 # Tinc VPN Setup and Configuration
 
 - name: Main - Set different base dir for macOS
+  when: (override_os_family is defined) | ternary(override_os_family,ansible_os_family) == "Darwin"
   ansible.builtin.set_fact:
     tinc_base_dir: /usr/local/etc/tinc
-  when: (override_os_family is defined) | ternary(override_os_family,ansible_os_family) == "Darwin"
 
 - name: Main - Install tinc
   ansible.builtin.include_tasks: "{{ item }}"
@@ -69,6 +69,7 @@
     flat: yes
 
 - name: "Main - Enable {{ tinc_vpn_id }}"
+  when: ansible_os_family != 'Darwin'
   become: yes
   block:
     - name: "Main - Enable {{ tinc_vpn_id }} in tinc config"
@@ -86,4 +87,3 @@
         name: "tinc@{{ tinc_vpn_id }}"
         state: restarted
         enabled: yes
-  when: ansible_os_family != 'Darwin'