summaryrefslogtreecommitdiffstats
path: root/krebs/3modules
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-12-04 18:33:43 +0100
committermakefu <github@syntax-fehler.de>2021-12-04 18:33:43 +0100
commitc22610c8e695cf9f8b48a1fa9040f57187064e77 (patch)
treede64a5cea287197a71dea4681d46c08919132dd7 /krebs/3modules
parent33d13bff84c85ad9f22300598a0c4115e3361f7f (diff)
parent70be7f119b25f1913be9a219f5dad0b179405b4e (diff)
Merge remote-tracking branch 'lass/21.11' into 21.11
Diffstat (limited to 'krebs/3modules')
-rw-r--r--krebs/3modules/brockman.nix2
-rw-r--r--krebs/3modules/buildbot/master.nix1
-rw-r--r--krebs/3modules/buildbot/slave.nix1
-rw-r--r--krebs/3modules/github-hosts-sync.nix3
-rw-r--r--krebs/3modules/htgen.nix3
-rw-r--r--krebs/3modules/realwallpaper.nix3
-rw-r--r--krebs/3modules/tinc_graphs.nix3
7 files changed, 16 insertions, 0 deletions
diff --git a/krebs/3modules/brockman.nix b/krebs/3modules/brockman.nix
index 7a78880ea..8427ca50b 100644
--- a/krebs/3modules/brockman.nix
+++ b/krebs/3modules/brockman.nix
@@ -11,10 +11,12 @@ in {
config = mkIf cfg.enable {
users.extraUsers.brockman = {
home = "/var/lib/brockman";
+ group = "brockman";
createHome = true;
isSystemUser = true;
uid = genid_uint31 "brockman";
};
+ users.groups.brockman = {};
systemd.services.brockman = {
description = "RSS to IRC broadcaster";
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix
index e55bd95ea..c30f31e31 100644
--- a/krebs/3modules/buildbot/master.nix
+++ b/krebs/3modules/buildbot/master.nix
@@ -319,6 +319,7 @@ let
users.extraUsers.buildbotMaster = {
uid = genid "buildbotMaster";
+ group = "buildbotMaster";
description = "Buildbot Master";
home = cfg.workDir;
createHome = false;
diff --git a/krebs/3modules/buildbot/slave.nix b/krebs/3modules/buildbot/slave.nix
index d877b9911..f97b50def 100644
--- a/krebs/3modules/buildbot/slave.nix
+++ b/krebs/3modules/buildbot/slave.nix
@@ -128,6 +128,7 @@ let
users.extraUsers.buildbotSlave = {
uid = genid "buildbotSlave";
+ group = "buildbotSlave";
description = "Buildbot Slave";
home = cfg.workDir;
createHome = false;
diff --git a/krebs/3modules/github-hosts-sync.nix b/krebs/3modules/github-hosts-sync.nix
index 9421576df..71eed6c69 100644
--- a/krebs/3modules/github-hosts-sync.nix
+++ b/krebs/3modules/github-hosts-sync.nix
@@ -66,11 +66,14 @@ let
users.users.${user.name} = {
inherit (user) uid;
+ group = user.name;
home = cfg.dataDir;
isSystemUser = true;
};
};
+ users.groups.${user.name} = {};
+
user = rec {
mail = "${name}@${config.krebs.build.host.name}";
name = "github-hosts-sync";
diff --git a/krebs/3modules/htgen.nix b/krebs/3modules/htgen.nix
index 517dad76f..4221703ec 100644
--- a/krebs/3modules/htgen.nix
+++ b/krebs/3modules/htgen.nix
@@ -69,10 +69,13 @@ let
users.users = mapAttrs' (name: htgen:
nameValuePair htgen.user.name {
inherit (htgen.user) home name uid;
+ group = htgen.user.name;
createHome = true;
isSystemUser = true;
}
) cfg;
+ users.groups = mapAttrs (_: _: {}) cfg;
+
};
in out
diff --git a/krebs/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix
index 1fa6012cf..167afed2c 100644
--- a/krebs/3modules/realwallpaper.nix
+++ b/krebs/3modules/realwallpaper.nix
@@ -59,10 +59,13 @@ let
users.extraUsers.realwallpaper = {
uid = genid "realwallpaper";
+ group = "realwallpaper";
home = cfg.workingDir;
createHome = true;
isSystemUser = true;
};
+
+ users.groups.realwallpaper = {};
};
in
diff --git a/krebs/3modules/tinc_graphs.nix b/krebs/3modules/tinc_graphs.nix
index 7a414e6e3..733db69ca 100644
--- a/krebs/3modules/tinc_graphs.nix
+++ b/krebs/3modules/tinc_graphs.nix
@@ -128,9 +128,12 @@ let
users.extraUsers.tinc_graphs = {
uid = genid_uint31 "tinc_graphs";
+ group = "tinc_graphs";
home = "/var/spool/tinc_graphs";
isSystemUser = true;
};
+ users.groups.tinc_graphs = {};
+
services.nginx = mkIf cfg.nginx.enable {
enable = mkDefault true;
virtualHosts = {