public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/cadvisor: rename 'host' to 'listenAddress'

Browse Source 
More descriptive option name.
This commit is contained in:
Bjørn Forsman 2015-12-24 00:14:40 +01:00
parent 6b10df7eaa
commit 38ca880612
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/rename.nix
View File

@ -14,6 +14,7 @@ with lib;
(mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
(mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
(mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ]) (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
(mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])

6
nixos/modules/services/monitoring/cadvisor.nix
View File

@ -14,7 +14,7 @@ in {
description = "Whether to enable cadvisor service."; description = "Whether to enable cadvisor service.";
}; };
host = mkOption { listenAddress = mkOption {
default = "127.0.0.1"; default = "127.0.0.1";
type = types.str; type = types.str;
description = "Cadvisor listening host"; description = "Cadvisor listening host";
@ -71,7 +71,7 @@ in {
after = [ "network.target" "docker.service" "influxdb.service" ]; after = [ "network.target" "docker.service" "influxdb.service" ];
postStart = mkBefore '' 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; sleep 1;
done done
''; '';
@ -79,7 +79,7 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = ''${pkgs.cadvisor}/bin/cadvisor \ ExecStart = ''${pkgs.cadvisor}/bin/cadvisor \
-logtostderr=true \ -logtostderr=true \
-listen_ip=${cfg.host} \ -listen_ip=${cfg.listenAddress} \
-port=${toString cfg.port} \ -port=${toString cfg.port} \
${optionalString (cfg.storageDriver != null) '' ${optionalString (cfg.storageDriver != null) ''
-storage_driver ${cfg.storageDriver} \ -storage_driver ${cfg.storageDriver} \