From 98e608de071465f5ad1beb42b11f2769b6320351 Mon Sep 17 00:00:00 2001
From: Ricard Illa <ricard@trkkn.com>
Date: Tue, 30 Aug 2022 11:20:20 +0200
Subject: [PATCH] refactor wheel things out of the basic role

---
 roles/basic/meta/main.yml              |  2 ++
 roles/basic/tasks/main.yml             | 17 -----------------
 roles/{basic => wheel}/files/doas.conf |  0
 roles/wheel/tasks/alpine.yml           | 11 +++++++++++
 roles/wheel/tasks/main.yml             |  8 ++++++++
 5 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 roles/basic/meta/main.yml
 rename roles/{basic => wheel}/files/doas.conf (100%)
 create mode 100644 roles/wheel/tasks/alpine.yml
 create mode 100644 roles/wheel/tasks/main.yml

diff --git a/roles/basic/meta/main.yml b/roles/basic/meta/main.yml
new file mode 100644
index 0000000..dc3020c
--- /dev/null
+++ b/roles/basic/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - role: wheel
diff --git a/roles/basic/tasks/main.yml b/roles/basic/tasks/main.yml
index 5d045b7..1b618c3 100644
--- a/roles/basic/tasks/main.yml
+++ b/roles/basic/tasks/main.yml
@@ -2,23 +2,6 @@
   apk:
     name: python3
 
-- name: create 'wheel' group
-  group:
-    name: wheel
-    gid: 10
-
-- name: install doas
-  apk:
-    name: doas
-
-- name: copy doas config
-  copy:
-    src: doas.conf
-    dest: /etc/doas.d/doas.conf
-    owner: root
-    group: root
-    mode: '0644'
-
 - name: create group 'rilla'
   group:
     name: rilla
diff --git a/roles/basic/files/doas.conf b/roles/wheel/files/doas.conf
similarity index 100%
rename from roles/basic/files/doas.conf
rename to roles/wheel/files/doas.conf
diff --git a/roles/wheel/tasks/alpine.yml b/roles/wheel/tasks/alpine.yml
new file mode 100644
index 0000000..b14dedd
--- /dev/null
+++ b/roles/wheel/tasks/alpine.yml
@@ -0,0 +1,11 @@
+- name: install doas
+  apk:
+    name: doas
+
+- name: copy doas config
+  copy:
+    src: doas.conf
+    dest: /etc/doas.d/doas.conf
+    owner: root
+    group: root
+    mode: '0644'
diff --git a/roles/wheel/tasks/main.yml b/roles/wheel/tasks/main.yml
new file mode 100644
index 0000000..e7af76a
--- /dev/null
+++ b/roles/wheel/tasks/main.yml
@@ -0,0 +1,8 @@
+- name: create 'wheel' group
+  group:
+    name: wheel
+    gid: 10
+
+- name: 'alpine-specific wheel things'
+  include_tasks: alpine.yml
+  when: ansible_distribution == "Alpine"