diff options
| author | Domen Kožar <domen@dev.si> | 2014-02-12 16:10:35 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-02-12 16:10:35 +0100 |
| commit | a49fbca134a8bf82bba61c5168b5057ea7f05120 (patch) | |
| tree | 4143324ee37178fdcd0d2b5126b100d74091ac90 /nixos/modules | |
| parent | 271de86a94cf7eb5366c2166eb8c11a854d86a7c (diff) | |
| parent | 884190a23837936813a33a4ae4bdc4c5ee58f349 (diff) | |
| download | nixlib-a49fbca134a8bf82bba61c5168b5057ea7f05120.tar nixlib-a49fbca134a8bf82bba61c5168b5057ea7f05120.tar.gz nixlib-a49fbca134a8bf82bba61c5168b5057ea7f05120.tar.bz2 nixlib-a49fbca134a8bf82bba61c5168b5057ea7f05120.tar.lz nixlib-a49fbca134a8bf82bba61c5168b5057ea7f05120.tar.xz nixlib-a49fbca134a8bf82bba61c5168b5057ea7f05120.tar.zst nixlib-a49fbca134a8bf82bba61c5168b5057ea7f05120.zip | |
Merge pull request #1730 from pSub/logcheck-uid
nixos: add uid for logcheck and only create a user for the default user
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/misc/ids.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/logging/logcheck.nix | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5f8111eb986b..6d8335516049 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -111,6 +111,7 @@ memcached = 100; cgminer = 101; munin = 102; + logcheck = 103; # When adding a uid, make sure it doesn't match an existing gid. diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 2a6a6516f488..ef147f95358c 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -208,12 +208,13 @@ in mapAttrsToList writeIgnoreRule cfg.ignore ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron; - users.extraUsers = singleton - { name = cfg.user; + users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton + { name = "logcheck"; + uid = config.ids.uids.logcheck; shell = "/bin/sh"; description = "Logcheck user account"; extraGroups = cfg.extraGroups; - }; + }); system.activationScripts.logcheck = '' mkdir -m 700 -p /var/{lib,lock}/logcheck |