From f558f1bc0c779cc310ff8a712d4f178db73de6ef Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 2 Jun 2021 00:11:38 +0200
Subject: *: set isSystemUser or isNormalUser

This is a requirement for nixpkgs 21.05, or else evaluation will fail
with:

Exactly one of users.users.${name}.isSystemUser and users.users.${name}.isNormalUser must be set.
---
 krebs/3modules/exim.nix  | 1 +
 krebs/3modules/git.nix   | 2 ++
 krebs/3modules/htgen.nix | 1 +
 krebs/3modules/tinc.nix  | 1 +
 4 files changed, 5 insertions(+)

(limited to 'krebs/3modules')

diff --git a/krebs/3modules/exim.nix b/krebs/3modules/exim.nix
index 83d88cb0..972c7f43 100644
--- a/krebs/3modules/exim.nix
+++ b/krebs/3modules/exim.nix
@@ -78,6 +78,7 @@ in {
         inherit (cfg.user) home name uid;
         createHome = true;
         group = cfg.group.name;
+        isSystemUser = true;
       };
     };
   };
diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix
index 4eb88134..d31d91b7 100644
--- a/krebs/3modules/git.nix
+++ b/krebs/3modules/git.nix
@@ -366,6 +366,7 @@ let
         # To allow running cgit-clear-cache via hooks.
         cfg.cgit.fcgiwrap.group.name
       ];
+      isSystemUser = true;
       shell = "/bin/sh";
       openssh.authorizedKeys.keys =
         unique
@@ -384,6 +385,7 @@ let
       users.${cfg.cgit.fcgiwrap.user.name} = {
         inherit (cfg.cgit.fcgiwrap.user) home name uid;
         group = cfg.cgit.fcgiwrap.group.name;
+        isSystemUser = true;
       };
     };
 
diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix
index 70c4fcd2..063bccc6 100644
--- a/krebs/3modules/htgen.nix
+++ b/krebs/3modules/htgen.nix
@@ -66,6 +66,7 @@ let
       nameValuePair htgen.user.name {
         inherit (htgen.user) home name uid;
         createHome = true;
+        isSystemUser = true;
       }
     ) cfg;
 
diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 4252c8d3..a8a78a43 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -236,6 +236,7 @@ let
       nameValuePair "${netname}" {
         inherit (cfg.user) home name uid;
         createHome = true;
+        isSystemUser = true;
       }
     ) config.krebs.tinc;
 
-- 
cgit v1.2.3