summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-29 10:45:06 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-29 10:45:06 +0200
commit0e23a175de3687df8232fe118cbe87f04228ff28 (patch)
tree8dfdb9f1e362ceaaa8bbe2bbd152a36a0510f5e6 /nixos/modules
parent05468f9b7893b4cdfdf093b271d54606a3457174 (diff)
downloadnixlib-0e23a175de3687df8232fe118cbe87f04228ff28.tar
nixlib-0e23a175de3687df8232fe118cbe87f04228ff28.tar.gz
nixlib-0e23a175de3687df8232fe118cbe87f04228ff28.tar.bz2
nixlib-0e23a175de3687df8232fe118cbe87f04228ff28.tar.lz
nixlib-0e23a175de3687df8232fe118cbe87f04228ff28.tar.xz
nixlib-0e23a175de3687df8232fe118cbe87f04228ff28.tar.zst
nixlib-0e23a175de3687df8232fe118cbe87f04228ff28.zip
Allocate system uids/gids between 400 and 500
Previously it was between 100 and 500, but this can already collide
with the static uids/guid in misc/ids.nix.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/misc/ids.nix8
-rw-r--r--nixos/modules/programs/shadow.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 2d9ea1450ff0..d653ac51143a 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -129,10 +129,10 @@
       foundationdb = 118;
       newrelic = 119;
       starbound = 120;
-      hydra     = 122;
-      spiped    = 123;
+      hydra = 122;
+      spiped = 123;
 
-      # When adding a uid, make sure it doesn't match an existing gid.
+      # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
       nixbld = 30000; # start of range of uids
       nobody = 65534;
@@ -237,7 +237,7 @@
       hydra = 122;
       spiped = 123;
 
-      # When adding a gid, make sure it doesn't match an existing uid.
+      # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!
 
       users = 100;
       nixbld = 30000;
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index a24350994992..27a18c726a3a 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -10,12 +10,12 @@ let
     ''
       DEFAULT_HOME yes
 
-      SYS_UID_MIN  100
+      SYS_UID_MIN  400
       SYS_UID_MAX  499
       UID_MIN      1000
       UID_MAX      29999
 
-      SYS_GID_MIN  100
+      SYS_GID_MIN  400
       SYS_GID_MAX  499
       GID_MIN      1000
       GID_MAX      29999