From ecbfbe45e0690185cb1a3e1902d80477ddf0aa99 Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Sun, 17 Jul 2022 19:35:15 +0100
Subject: [PATCH] Remove duplication

---
 admin-cli.yml | 32 ++------------------------------
 admin-gui.yml | 33 +++------------------------------
 main.yml      | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 60 deletions(-)
 create mode 100755 main.yml

diff --git a/admin-cli.yml b/admin-cli.yml
index c0273b0..a4a673d 100755
--- a/admin-cli.yml
+++ b/admin-cli.yml
@@ -20,33 +20,5 @@
     gui: false
     wsl_distro: "{{ lookup('env', 'WSL_DISTRO_NAME') }}"
   tasks:
-    - include_role:
-        name: arch
-      when: ansible_distribution == 'Archlinux'
-    - include_role:
-        name: debian
-      when: ansible_distribution == 'Debian'
-    - include_role:
-        name: el
-      when: ansible_distribution == 'CentOS' or ansible_distribution == 'AlmaLinux'
-    - include_role:
-        name: fedora
-      when: ansible_distribution == 'Fedora'
-    - include_role:
-        name: opensuse-leap
-      when: ansible_distribution == 'openSUSE Leap'
-    - include_role:
-        name: opensuse-tumbleweed
-      when: ansible_distribution == 'openSUSE Tumbleweed'
-    - include_role:
-        name: freebsd
-      when: ansible_distribution == 'FreeBSD'
-    - include_role:
-        name: netbsd
-      when: ansible_distribution == 'NetBSD'
-    - include_role:
-        name: ubuntu
-      when: ansible_distribution == 'Ubuntu'
-    - include_role:
-        name: kali
-      when: ansible_distribution == 'Kali'
+    - name: Include main
+      ansible.builtin.include_tasks: main.yml
diff --git a/admin-gui.yml b/admin-gui.yml
index c943d10..05609c8 100755
--- a/admin-gui.yml
+++ b/admin-gui.yml
@@ -18,34 +18,7 @@
   hosts: all
   vars:
     gui: true
+    wsl_distro: "{{ lookup('env', 'WSL_DISTRO_NAME') }}"
   tasks:
-    - include_role:
-        name: arch
-      when: ansible_distribution == 'Archlinux'
-    - include_role:
-        name: debian
-      when: ansible_distribution == 'Debian'
-    - include_role:
-        name: el
-      when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' or ansible_distribution == 'AlmaLinux'
-    - include_role:
-        name: fedora
-      when: ansible_distribution == 'Fedora'
-    - include_role:
-        name: opensuse-leap
-      when: ansible_distribution == 'openSUSE Leap'
-    - include_role:
-        name: opensuse-tumbleweed
-      when: ansible_distribution == 'openSUSE Tumbleweed'
-    - include_role:
-        name: freebsd
-      when: ansible_distribution == 'FreeBSD'
-    - include_role:
-        name: netbsd
-      when: ansible_distribution == 'NetBSD'
-    - include_role:
-        name: ubuntu
-      when: ansible_distribution == 'Ubuntu'
-    - include_role:
-        name: kali
-      when: ansible_distribution == 'Kali'
+    - name: Include main
+      ansible.builtin.include_tasks: main.yml
diff --git a/main.yml b/main.yml
new file mode 100755
index 0000000..f549727
--- /dev/null
+++ b/main.yml
@@ -0,0 +1,46 @@
+#!/usr/bin/env ansible-playbook
+---
+# Copyright 2021 Anthony Perkins
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- include_role:
+    name: arch
+  when: ansible_distribution == 'Archlinux'
+- include_role:
+    name: debian
+  when: ansible_distribution == 'Debian'
+- include_role:
+    name: el
+  when: ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' or ansible_distribution == 'AlmaLinux'
+- include_role:
+    name: fedora
+  when: ansible_distribution == 'Fedora'
+- include_role:
+    name: opensuse-leap
+  when: ansible_distribution == 'openSUSE Leap'
+- include_role:
+    name: opensuse-tumbleweed
+  when: ansible_distribution == 'openSUSE Tumbleweed'
+- include_role:
+    name: freebsd
+  when: ansible_distribution == 'FreeBSD'
+- include_role:
+    name: netbsd
+  when: ansible_distribution == 'NetBSD'
+- include_role:
+    name: ubuntu
+  when: ansible_distribution == 'Ubuntu'
+- include_role:
+    name: kali
+  when: ansible_distribution == 'Kali'