summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2013-12-14 22:55:00 -0800
committerMichael Raskin <7c6f434c@mail.ru>2013-12-14 22:55:00 -0800
commitbdd1fea87b59dc7a47f12e1fc749ad5a46d4187f (patch)
tree9f096ea57cf97bfcd41358d773a2b493c7c0ff8c /nixos/modules
parent1bc96da130d1f680cf4a9b641e4ae436d5be2a00 (diff)
parent24e2ef512682a4c86c9b2f22c3412fbf74639cea (diff)
downloadnixpkgs-bdd1fea87b59dc7a47f12e1fc749ad5a46d4187f.tar
nixpkgs-bdd1fea87b59dc7a47f12e1fc749ad5a46d4187f.tar.gz
nixpkgs-bdd1fea87b59dc7a47f12e1fc749ad5a46d4187f.tar.bz2
nixpkgs-bdd1fea87b59dc7a47f12e1fc749ad5a46d4187f.tar.lz
nixpkgs-bdd1fea87b59dc7a47f12e1fc749ad5a46d4187f.tar.xz
nixpkgs-bdd1fea87b59dc7a47f12e1fc749ad5a46d4187f.tar.zst
nixpkgs-bdd1fea87b59dc7a47f12e1fc749ad5a46d4187f.zip
Merge pull request #1373 from offlinehacker/nixos/memcached/user_fix
memcached: set uid to make it work with #1076
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/misc/ids.nix1
-rw-r--r--nixos/modules/services/databases/memcached.nix3
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ccd75d5b915..6f2666e4ae5 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -108,6 +108,7 @@
       haproxy = 97;
       mongodb = 98;
       openldap = 99;
+      memcached = 100;
 
       # When adding a uid, make sure it doesn't match an existing gid.
 
diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix
index a0e264f2299..505253229c9 100644
--- a/nixos/modules/services/databases/memcached.nix
+++ b/nixos/modules/services/databases/memcached.nix
@@ -68,8 +68,9 @@ in
 
   config = mkIf config.services.memcached.enable {
 
-    users.extraUsers = singleton
+    users.extraUsers.memcached =
       { name = cfg.user;
+        uid = config.ids.uids.memcached;
         description = "Memcached server user";
       };