diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-12-01 17:20:18 +0100 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-12-01 17:20:35 +0100 |
| commit | 40d73c5eb7c9beffea60d34161fd080881760c4a (patch) | |
| tree | 5b2e4249f8b328236a62dfaece54e2f79a67f041 /nixos/modules/virtualisation/docker.nix | |
| parent | 77049af46f122418114ae9751952282d30695bc3 (diff) | |
| download | nixlib-40d73c5eb7c9beffea60d34161fd080881760c4a.tar nixlib-40d73c5eb7c9beffea60d34161fd080881760c4a.tar.gz nixlib-40d73c5eb7c9beffea60d34161fd080881760c4a.tar.bz2 nixlib-40d73c5eb7c9beffea60d34161fd080881760c4a.tar.lz nixlib-40d73c5eb7c9beffea60d34161fd080881760c4a.tar.xz nixlib-40d73c5eb7c9beffea60d34161fd080881760c4a.tar.zst nixlib-40d73c5eb7c9beffea60d34161fd080881760c4a.zip | |
nixos/docker: fix module, add simple test
Diffstat (limited to 'nixos/modules/virtualisation/docker.nix')
| -rw-r--r-- | nixos/modules/virtualisation/docker.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 9ae9624fd481..5be76b2682f5 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -7,8 +7,8 @@ with lib; let cfg = config.virtualisation.docker; - pro = config.nix.proxy; - proxy_env = optionalAttrs (pro != "") { Environment = "\"http_proxy=${pro}\""; }; + pro = config.networking.proxy.default; + proxy_env = optionalAttrs (pro != null) { Environment = "\"http_proxy=${pro}\""; }; in |