users: prepare for running on other OSes

9 files changed, 20 insertions, 8 deletions

diff --git a/roles/fedora/defaults/main.yml b/roles/fedora/defaults/main.yml
new file mode 100644
index 0000000..4304fa0
--- /dev/null
+++ b/roles/fedora/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+sudo_group: 'wheel'
+
+# vim: set ts=2 sw=2 et:
diff --git a/roles/users/tasks/ast.yml b/roles/users/tasks/ast.yml
index 4e1501c..309323e 100644
--- a/roles/users/tasks/ast.yml
+++ b/roles/users/tasks/ast.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'Asbjørn Sloth Tønnesen'
     name: ast
+    shell: '/bin/bash'
     uid: 1001
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: ast - authorized_keys
   authorized_key:
diff --git a/roles/users/tasks/esmil.yml b/roles/users/tasks/esmil.yml
index a60e905..0624d30 100644
--- a/roles/users/tasks/esmil.yml
+++ b/roles/users/tasks/esmil.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'Emil Renner Berthing'
     name: esmil
+    shell: '/bin/bash'
     uid: 1000
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: esmil - authorized_keys
   authorized_key:
diff --git a/roles/users/tasks/flummer.yml b/roles/users/tasks/flummer.yml
index d72eeec..a8e4233 100644
--- a/roles/users/tasks/flummer.yml
+++ b/roles/users/tasks/flummer.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'Thomas Flummer'
     name: flummer
+    shell: '/bin/bash'
     uid: 1002
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: flummer - authorized_keys
   authorized_key:
diff --git a/roles/users/tasks/k2OS.yml b/roles/users/tasks/k2OS.yml
index cc26e08..5eace43 100644
--- a/roles/users/tasks/k2OS.yml
+++ b/roles/users/tasks/k2OS.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'René Mikkelsen'
     name: k2OS
+    shell: '/bin/bash'
     uid: 1005
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: k2OS - authorized_keys
   authorized_key:
diff --git a/roles/users/tasks/knielsen.yml b/roles/users/tasks/knielsen.yml
index c645b19..79dc17f 100644
--- a/roles/users/tasks/knielsen.yml
+++ b/roles/users/tasks/knielsen.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'Kristian Nielsen'
     name: knielsen
+    shell: '/bin/bash'
     uid: 1004
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: knielsen - authorized_keys
   authorized_key:
diff --git a/roles/users/tasks/riiiis.yml b/roles/users/tasks/riiiis.yml
index 986b10d..e2fe2e1 100644
--- a/roles/users/tasks/riiiis.yml
+++ b/roles/users/tasks/riiiis.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'Christian Riis'
     name: riiiis
+    shell: '/bin/bash'
     uid: 1003
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: riiiis - authorized_keys
   authorized_key:
diff --git a/roles/users/tasks/semi.yml b/roles/users/tasks/semi.yml
index 4f0d080..5e017fd 100644
--- a/roles/users/tasks/semi.yml
+++ b/roles/users/tasks/semi.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'Troels Bang Jensen'
     name: semi
+    shell: '/bin/bash'
     uid: 1010
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: semi - authorized_keys
   authorized_key:
diff --git a/roles/users/tasks/signout.yml b/roles/users/tasks/signout.yml
index a60adc7..dbade04 100644
--- a/roles/users/tasks/signout.yml
+++ b/roles/users/tasks/signout.yml
@@ -3,10 +3,11 @@
   user:
     comment: 'Dennis K Jensen'
     name: signout
+    shell: '/bin/bash'
     uid: 1024
     group: users
     groups:
-    - wheel
+    - '{{ sudo_group }}'
 
 - name: signout - authorized_keys
   authorized_key: