From 1bfcf40d736be8d1168475a0babcdbad8f72bfe2 Mon Sep 17 00:00:00 2001 From: Denis Knauf Date: Wed, 23 Jun 2021 16:53:57 +0200 Subject: [PATCH] tasks for users moved to own file. --- tasks/ohmyzsh.yml | 11 ----------- tasks/os-debian.yml | 1 + tasks/os-redhat.yml | 1 + tasks/users.yml | 10 ++++++++++ 4 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 tasks/users.yml diff --git a/tasks/ohmyzsh.yml b/tasks/ohmyzsh.yml index fa3c745..910efb4 100644 --- a/tasks/ohmyzsh.yml +++ b/tasks/ohmyzsh.yml @@ -15,14 +15,3 @@ template: src: dotzshrc dest: "/etc/skel/.zshrc" -- name: 'setup default user(s)' - tags: ohmyzsh - with_items: '{{sys_default_users}}' - user: - name: '{{item.name}}' - home: '{{item.home | default("/home/"+item.name)}}' - shell: '{{item.shell | default("/usr/bin/zsh")}}' - groups: [users] - createhome: yes - move_home: yes - append: yes diff --git a/tasks/os-debian.yml b/tasks/os-debian.yml index 5315f9a..8068ad8 100644 --- a/tasks/os-debian.yml +++ b/tasks/os-debian.yml @@ -164,6 +164,7 @@ - include_tasks: sshd_config.yml - include_tasks: ohmyzsh.yml +- include_tasks: users.yml - include_tasks: systemd.yml - name: update timezone diff --git a/tasks/os-redhat.yml b/tasks/os-redhat.yml index c1583b5..196257e 100644 --- a/tasks/os-redhat.yml +++ b/tasks/os-redhat.yml @@ -47,6 +47,7 @@ - include_tasks: sshd_config.yml - include_tasks: systemd.yml - include_tasks: ohmyzsh.yml +- include_tasks: users.yml - name: setup mailname copy: diff --git a/tasks/users.yml b/tasks/users.yml new file mode 100644 index 0000000..8272500 --- /dev/null +++ b/tasks/users.yml @@ -0,0 +1,10 @@ +- name: 'setup default user(s)' + with_items: '{{sys_default_users}}' + user: + name: '{{item.name}}' + home: '{{item.home | default("/home/"+item.name)}}' + shell: '{{item.shell | default("/usr/bin/zsh")}}' + groups: '{{item.groups | default([users])}}' + createhome: yes + move_home: yes + append: yes