From 3d49ca43bedc3232f92a361c9c04d92d40caf02a Mon Sep 17 00:00:00 2001
From: Luka Vandervelden <lukc@upyum.com>
Date: Sat, 4 Jan 2020 09:08:55 +0100
Subject: [PATCH] Improved groups creation and edition.

---
 src/service/service.cr | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/service/service.cr b/src/service/service.cr
index ed33b7f..cb39847 100644
--- a/src/service/service.cr
+++ b/src/service/service.cr
@@ -684,10 +684,18 @@ class Service
 
 	def create_user_and_group!
 		Passwd.new("/etc/passwd", "/etc/group").tap do |passwd|
-			return if passwd.get_user user_name
+			if user = passwd.get_user user_name
+				group = passwd.get_group user_name
 
-			passwd.add_user user_name,
-				full_name: "Service[#{id}]"
+				return if group.nil?
+
+				group.users = reverse_dependencies.map &.user_name
+
+				passwd.mod_group group
+			else
+				passwd.add_user user_name,
+					full_name: "Service[#{id}]"
+			end
 		end
 	end