From 536694bcd4d8aa260096d3f2388cf020980c693f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Wed, 18 Mar 2015 14:30:12 +0100
Subject: nixos/cadvisor: fixes

- run as non root user, because of docker
- run docker by default
---
 nixos/modules/services/monitoring/cadvisor.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'nixos/modules/services/monitoring/cadvisor.nix')

diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix
index 0a06291da2a..b6cf397f35c 100644
--- a/nixos/modules/services/monitoring/cadvisor.nix
+++ b/nixos/modules/services/monitoring/cadvisor.nix
@@ -90,17 +90,9 @@ in {
             ${optionalString cfg.storageDriverSecure "-storage_driver_secure"}
           ''}
         '';
-        User = "cadvisor";
       };
     };
 
-    virtualisation.docker.enable = true;
-
-    users.extraUsers = singleton {
-      name = "cadvisor";
-      uid = config.ids.uids.cadvisor;
-      description = "Cadvisor user";
-      extraGroups = [ "docker" ];
-    };
+    virtualisation.docker.enable = mkDefault true;
   };
 }
-- 
cgit 1.4.1