From 0372f4b848d42b5df2b47394404b50904684c97b Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sat, 17 Apr 2021 20:16:27 +0100
Subject: [PATCH] ops/nixos: set isNormalUser for all existing users

Now there's an assertion which requires either isNormalUser or isSystemUser, so
we set one of them for all the users we have already.
---
 ops/nixos/clouvider-lon01/default.nix | 2 ++
 ops/nixos/kusakabe/default.nix        | 5 ++++-
 ops/nixos/lib/ts3spotifybot.nix       | 2 ++
 ops/nixos/marukuru/default.nix        | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ops/nixos/clouvider-lon01/default.nix b/ops/nixos/clouvider-lon01/default.nix
index 7bf96a8bfc..6130494c63 100644
--- a/ops/nixos/clouvider-lon01/default.nix
+++ b/ops/nixos/clouvider-lon01/default.nix
@@ -285,6 +285,8 @@ in {
     package = depot.nix.pkgs.heptapod-runner;
   };
   users.users.gitlab-runner = {
+    isNormalUser = true;
+    group = "nogroup";
     createHome = true;
     home = "/srv/gitlab-runner";
   };
diff --git a/ops/nixos/kusakabe/default.nix b/ops/nixos/kusakabe/default.nix
index 6cc59cd8b6..20a28d4470 100644
--- a/ops/nixos/kusakabe/default.nix
+++ b/ops/nixos/kusakabe/default.nix
@@ -329,7 +329,10 @@ in {
       };
     };
   };
-  users.users.rsync = {};
+  users.users.rsync = {
+    isNormalUser = true;
+    group = "nogroup";
+  };
   systemd.services.rsyncd = {
     confinement.enable = true;
     serviceConfig = {
diff --git a/ops/nixos/lib/ts3spotifybot.nix b/ops/nixos/lib/ts3spotifybot.nix
index b61ba246dd..9412bbc526 100644
--- a/ops/nixos/lib/ts3spotifybot.nix
+++ b/ops/nixos/lib/ts3spotifybot.nix
@@ -11,6 +11,8 @@ let
 in
 {
   users.users.ts3musicbot = {
+    isNormalUser = true;
+    group = "nogroup";
     createHome = true;
     home = "/var/lib/ts3musicbot";
   };
diff --git a/ops/nixos/marukuru/default.nix b/ops/nixos/marukuru/default.nix
index dd27420a6d..4b3ec6a136 100644
--- a/ops/nixos/marukuru/default.nix
+++ b/ops/nixos/marukuru/default.nix
@@ -204,6 +204,8 @@ in {
         package = depot.nix.pkgs.heptapod-runner;
       };
       users.users.gitlab-runner = {
+        isNormalUser = true;
+        group = "nogroup";
         createHome = true;
         home = "/srv/gitlab-runner";
       };