From 785dc9c67ca2a9f3e253fdafae734ba862477396 Mon Sep 17 00:00:00 2001
From: L-Nafaryus <l.nafaryus@gmail.com>
Date: Tue, 16 Jan 2024 12:58:07 +0500
Subject: [PATCH] catarina: change gitea user

---
 nixosConfigurations/catarina/default.nix | 26 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/nixosConfigurations/catarina/default.nix b/nixosConfigurations/catarina/default.nix
index 5f1e1a4..5ca9f4d 100644
--- a/nixosConfigurations/catarina/default.nix
+++ b/nixosConfigurations/catarina/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, inputs, self, ... }:
-{
+rec {
     system.stateVersion = "23.11";
 
     imports = [ ./hardware.nix ./users.nix ];
@@ -136,18 +136,22 @@
         enable = true;
         authentication = ''
             # Type      Database    DB-User     Auth-Method     Ident-Map(optional)
-            local       gitea       all         ident           map=gitea-users
+            local       git         all         ident           map=gitea-users
         '';
         identMap = ''
             # MapName       System-User     DB-User
-            gitea-users     gitea           gitea
+            gitea-users     git           git
         '';
-        ensureDatabases = [ "gitea" ];
+        ensureDatabases = [ "git" ];
     };
 
     services.gitea = {
         enable = true;
 
+        user = "git";
+        group = "gitea";
+        stateDir = "/var/lib/gitea";
+
         settings = {
             server = {
                 DOMAIN = "vcs.elnafo.ru";
@@ -160,7 +164,7 @@
 
             mailer = {
                 ENABLED = true;
-                FROM = "gitea@elnafo.ru";
+                FROM = "git@elnafo.ru";
             };
 
             service.DISABLE_REGISTRATION = true;
@@ -174,8 +178,8 @@
         database = {
             type = "postgres";
             passwordFile = "/var/lib/secrets/gitea/gitea-dbpassword";
-            name = "gitea";
-            user = "gitea";
+            name = "git";
+            user = "git";
         };
 
         lfs.enable = true;
@@ -183,6 +187,14 @@
         appName = "Elnafo VCS";
     };
 
+    users.users.${services.gitea.user} = {
+        description = "Gitea Service";
+        home = services.gitea.stateDir;
+        useDefaultShell = true;
+        group = services.gitea.group;
+        isSystemUser = true;
+    };
+
     services.spoofdpi.enable = true;
 
 # Packages