From 99fbfc42fee912fa327615706144285c786dbf1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sun, 23 Feb 2020 14:59:27 +0100
Subject: [PATCH] Fix user group handling

---
 user.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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