From a6c42b59459ad08a76fa13fc4019f93ae8d75335 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Fri, 20 Nov 2015 23:01:33 +0100
Subject: nixos/docker: enable socketActivation by default

---
 nixos/modules/virtualisation/docker.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'nixos')

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 0c642bf3b816..718ca0851477 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -31,16 +31,11 @@ in
     socketActivation =
       mkOption {
         type = types.bool;
-        default = false;
+        default = true;
         description =
           ''
             This option enables docker with socket activation. I.e. docker will
             start when first called by client.
-
-            Note: This is false by default because systemd lower than 214 that
-            nixos uses so far, doesn't support SocketGroup option, so socket
-            created by docker has root group now. This will likely be changed
-            in future.  So set this option explicitly to false if you wish.
           '';
       };
     storageDriver =
-- 
cgit 1.4.1