summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/admin-user/tasks/main.yaml17
-rw-r--r--roles/base/tasks/main.yaml1
-rw-r--r--roles/zsh/tasks/main.yaml6
3 files changed, 23 insertions, 1 deletions
diff --git a/roles/admin-user/tasks/main.yaml b/roles/admin-user/tasks/main.yaml
new file mode 100644
index 00000000..e6fc3572
--- /dev/null
+++ b/roles/admin-user/tasks/main.yaml
@@ -0,0 +1,17 @@
+---
+- name: install sudo
+ apt:
+ name: sudo
+ state: present
+
+- name: add admin users
+ with_items: "{{ admin_user_group | default([]) | union(admin_user_host | default([])) }}"
+ user:
+ name: "{{ item.name }}"
+ state: present
+ password: "{{ item.password | default(omit) }}"
+ groups:
+ - sudo
+ - adm
+ append: yes
+ shell: "{{ item.shell | default(omit) }}"
diff --git a/roles/base/tasks/main.yaml b/roles/base/tasks/main.yaml
index fa4efc07..dae87269 100644
--- a/roles/base/tasks/main.yaml
+++ b/roles/base/tasks/main.yaml
@@ -20,7 +20,6 @@
- mtr-tiny
- tcpdump
- unp
- - sudo
- haveged
- dbus
- libpam-systemd
diff --git a/roles/zsh/tasks/main.yaml b/roles/zsh/tasks/main.yaml
index c1d63b7a..23e8e9f5 100644
--- a/roles/zsh/tasks/main.yaml
+++ b/roles/zsh/tasks/main.yaml
@@ -20,6 +20,12 @@
shell: /bin/zsh
with_items: "{{ [ 'root' ] | union(zsh_loginshell_user | default([])) }}"
+- name: make zsh the default shell for useradd
+ lineinfile:
+ regexp: '^#?SHELL='
+ line: 'SHELL=/bin/zsh'
+ path: /etc/adduser.conf
+
- name: make zsh the default shell for adduser
lineinfile:
regexp: '^#?DSHELL='