Fix user group handling

This commit is contained in:
2020-02-23 14:59:27 +01:00
parent 3c35e2f47b
commit 99fbfc42fe

View File

@@ -35,9 +35,12 @@
- docker - docker
when: distro == 'fedora' when: distro == 'fedora'
- set_fact:
user_group_name: "{{ user.group|default(user.name) }}"
- name: create user group - name: create user group
group: group:
name: "{{ user.name }}" name: "{{ user_group_name }}"
state: present state: present
become: true become: true
become_user: root become_user: root
@@ -45,7 +48,7 @@
- name: set groups - name: set groups
user: user:
name: "{{ user.name }}" name: "{{ user.name }}"
groups: "{{ [user.name, 'dotfiles'] + user_groups }}" groups: "{{ [user_group_name, 'dotfiles'] + user_groups }}"
become: true become: true
become_user: root become_user: root
@@ -110,7 +113,7 @@
force: true force: true
follow: false follow: false
owner: "{{ user.name }}" owner: "{{ user.name }}"
group: "{{ user.name }}" group: "{{ user_group_name }}"
path: "/home/{{ user.name }}/.dotfiles" path: "/home/{{ user.name }}/.dotfiles"
src: "{{ playbook_dir }}" src: "{{ playbook_dir }}"
tags: tags:
@@ -147,7 +150,7 @@
path: "/home/{{ user.name }}/{{ item.to }}" path: "/home/{{ user.name }}/{{ item.to }}"
src: /var/lib/dotfiles/{{ item.from }} src: /var/lib/dotfiles/{{ item.from }}
owner: "{{ user.name }}" owner: "{{ user.name }}"
group: "{{ user.name }}" group: "{{ user_group_name }}"
mode: "{{ item.mode | default('0644') }}" mode: "{{ item.mode | default('0644') }}"
when: not item.template|default(false) when: not item.template|default(false)
with_items: "{{ dotfiles }}" with_items: "{{ dotfiles }}"
@@ -182,7 +185,7 @@
src: /home/{{ user.name }}/.dotfiles/{{ item.from }}.j2 src: /home/{{ user.name }}/.dotfiles/{{ item.from }}.j2
dest: "/home/{{ user.name }}/{{ item.to }}" dest: "/home/{{ user.name }}/{{ item.to }}"
owner: "{{ user.name }}" owner: "{{ user.name }}"
group: "{{ user.name }}" group: "{{ user_group_name }}"
force: true force: true
become: true become: true
become_user: root become_user: root