Merge remote-tracking branch 'origin/master' into closure-size

2015-11-25 21:37:30 +01:00
parent 8a664fd5bc b34a6c96ee
commit a412927924
659 changed files with 46562 additions and 13611 deletions
@@ -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 =