summary refs log tree commit diff
path: root/nixos/modules/misc
diff options
context:
space:
mode:
authorPaul Colomiets <paul@colomiets.name>2014-07-28 01:00:59 +0300
committerJaka Hudoklin <jakahudoklin@gmail.com>2014-07-28 21:45:49 +0200
commit9bc1676e5ab6900697e7b34c50a3ca7b48f6a258 (patch)
tree38acdb2ae7ffd262c50538028a29ef13730ff44e /nixos/modules/misc
parent88a8b004c6cd8aa4e67cf4400077452df9b260ec (diff)
downloadnixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar
nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.gz
nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.bz2
nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.lz
nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.xz
nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.tar.zst
nixpkgs-9bc1676e5ab6900697e7b34c50a3ca7b48f6a258.zip
Upgrade docker to 1.1.2 and add docker module
This version of module has disabled socketActivation, because until
nixos upgrade systemd to at least 214, systemd does not support
SocketGroup. So socket is created with "root" group when
socketActivation enabled. Should be fixed as soon as systemd upgraded.

Includes changes from #3015 and supersedes #3028
Diffstat (limited to 'nixos/modules/misc')
-rw-r--r--nixos/modules/misc/ids.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index c337b9e6191..4ba81dadb31 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -250,6 +250,7 @@
       znc = 128;
       polipo = 129;
       mopidy = 130;
+      docker = 131;
 
       # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399!