about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-03-23 20:42:36 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-03-24 17:14:22 +0100
commit9bf6e6486031db37a6507156feb23b369ccebdcb (patch)
treee3c77b577b08201f7c7d4061797cd165a555caf1 /nixos
parent03bdf8f03cbc9157bd04aa786d366bdbb2acd234 (diff)
downloadnixlib-9bf6e6486031db37a6507156feb23b369ccebdcb.tar
nixlib-9bf6e6486031db37a6507156feb23b369ccebdcb.tar.gz
nixlib-9bf6e6486031db37a6507156feb23b369ccebdcb.tar.bz2
nixlib-9bf6e6486031db37a6507156feb23b369ccebdcb.tar.lz
nixlib-9bf6e6486031db37a6507156feb23b369ccebdcb.tar.xz
nixlib-9bf6e6486031db37a6507156feb23b369ccebdcb.tar.zst
nixlib-9bf6e6486031db37a6507156feb23b369ccebdcb.zip
dnscrypt-proxy service: use dynamic uid/gid
The daemon doesn't have any portable data, reserving a
UID/GID for it is redundant.

This frees up UID/GID 151.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/misc/ids.nix2
-rw-r--r--nixos/modules/services/networking/dnscrypt-proxy.nix7
2 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 46c288f9296b..f71d1e3fe200 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -176,7 +176,6 @@
       seeks = 148;
       prosody = 149;
       i2pd = 150;
-      dnscrypt-proxy = 151;
       systemd-network = 152;
       systemd-resolve = 153;
       systemd-timesync = 154;
@@ -414,7 +413,6 @@
       seeks = 148;
       prosody = 149;
       i2pd = 150;
-      dnscrypt-proxy = 151;
       systemd-network = 152;
       systemd-resolve = 153;
       systemd-timesync = 154;
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 3d5ce7b9d5ce..2c5c82f4d55c 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -173,11 +173,12 @@ in
       }
     ''));
 
-    users.extraUsers.dnscrypt-proxy = {
-      uid = config.ids.uids.dnscrypt-proxy;
+    users.users.dnscrypt-proxy = {
       description = "dnscrypt-proxy daemon user";
+      isSystemUser = true;
+      group = "dnscrypt-proxy";
     };
-    users.extraGroups.dnscrypt-proxy.gid = config.ids.gids.dnscrypt-proxy;
+    users.groups.dnscrypt-proxy = {};
 
     systemd.sockets.dnscrypt-proxy = {
       description = "dnscrypt-proxy listening socket";