diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-12-24 00:14:40 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-12-24 00:14:40 +0100 |
| commit | 38ca880612ff37695659b8b56af70553b2193f5f (patch) | |
| tree | a7b36540e2139695c8582d59a63153978b30260a /nixos/modules | |
| parent | 6b10df7eaa28e7f1d107603f9e252bc6f1f78acd (diff) | |
| download | nixlib-38ca880612ff37695659b8b56af70553b2193f5f.tar nixlib-38ca880612ff37695659b8b56af70553b2193f5f.tar.gz nixlib-38ca880612ff37695659b8b56af70553b2193f5f.tar.bz2 nixlib-38ca880612ff37695659b8b56af70553b2193f5f.tar.lz nixlib-38ca880612ff37695659b8b56af70553b2193f5f.tar.xz nixlib-38ca880612ff37695659b8b56af70553b2193f5f.tar.zst nixlib-38ca880612ff37695659b8b56af70553b2193f5f.zip | |
nixos/cadvisor: rename 'host' to 'listenAddress'
More descriptive option name.
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/monitoring/cadvisor.nix | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index c9e91cca2ec5..6522cc240bb6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -14,6 +14,7 @@ with lib; (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) + (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index b6cf397f35c0..425e0ee9230f 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -14,7 +14,7 @@ in { description = "Whether to enable cadvisor service."; }; - host = mkOption { + listenAddress = mkOption { default = "127.0.0.1"; type = types.str; description = "Cadvisor listening host"; @@ -71,7 +71,7 @@ in { after = [ "network.target" "docker.service" "influxdb.service" ]; postStart = mkBefore '' - until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do + until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.listenAddress}:${toString cfg.port}/containers/'; do sleep 1; done ''; @@ -79,7 +79,7 @@ in { serviceConfig = { ExecStart = ''${pkgs.cadvisor}/bin/cadvisor \ -logtostderr=true \ - -listen_ip=${cfg.host} \ + -listen_ip=${cfg.listenAddress} \ -port=${toString cfg.port} \ ${optionalString (cfg.storageDriver != null) '' -storage_driver ${cfg.storageDriver} \ |