From 5b602799f65d77f1f2d58ef8194f03760d8ff725 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Sat, 29 Mar 2025 07:25:16 -0400 Subject: [PATCH] fix(forgejo): fix possible duplicate user creation --- modules/forgejo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix index 7200449..615958e 100644 --- a/modules/forgejo/default.nix +++ b/modules/forgejo/default.nix @@ -46,7 +46,7 @@ in { ++ lib.optional (!(builtins.isNull cfg.templates)) "L+ ${forgejo.stateDir}/custom/templates - - - - ${cfg.templates}"; - users.users = lib.mkIf cfg.createUser { + users.users = lib.mkIf (cfg.createUser && forgejo.user != "forgejo") { ${forgejo.user} = { home = forgejo.stateDir; useDefaultShell = true; @@ -54,7 +54,7 @@ in { isSystemUser = true; }; }; - users.groups = lib.mkIf cfg.createUser { + users.groups = lib.mkIf (cfg.createUser && forgejo.group != "forgejo") { ${forgejo.group} = {}; }; }