summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-03-21 22:36:11 +0100
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-03-21 22:36:11 +0100
commit916aab2927bf6ba8b157a646d9535246253a6b18 (patch)
tree63f03fd7275d53f0748df3939641a88fdd595176 /nixos/modules/services
parentffaabcd62257d5d8150c94a78b00edb7cb4e7489 (diff)
parent536694bcd4d8aa260096d3f2388cf020980c693f (diff)
downloadnixlib-916aab2927bf6ba8b157a646d9535246253a6b18.tar
nixlib-916aab2927bf6ba8b157a646d9535246253a6b18.tar.gz
nixlib-916aab2927bf6ba8b157a646d9535246253a6b18.tar.bz2
nixlib-916aab2927bf6ba8b157a646d9535246253a6b18.tar.lz
nixlib-916aab2927bf6ba8b157a646d9535246253a6b18.tar.xz
nixlib-916aab2927bf6ba8b157a646d9535246253a6b18.tar.zst
nixlib-916aab2927bf6ba8b157a646d9535246253a6b18.zip
Merge pull request #6875 from offlinehacker/nixos/cadvisor/fix
nixos/cadvisor: fixes
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/monitoring/cadvisor.nix10
1 files changed, 1 insertions, 9 deletions
diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix
index 0a06291da2a4..b6cf397f35c0 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;
   };
 }