diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-12-24 00:20:39 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-12-24 00:20:39 +0100 |
commit | 8b9f3c8c35eb3d8c85cf168618b264c76bca687b (patch) | |
tree | f05cd18d3225dd7cb21264dd534366587218bad6 /nixos | |
parent | 38ca880612ff37695659b8b56af70553b2193f5f (diff) | |
download | nixlib-8b9f3c8c35eb3d8c85cf168618b264c76bca687b.tar nixlib-8b9f3c8c35eb3d8c85cf168618b264c76bca687b.tar.gz nixlib-8b9f3c8c35eb3d8c85cf168618b264c76bca687b.tar.bz2 nixlib-8b9f3c8c35eb3d8c85cf168618b264c76bca687b.tar.lz nixlib-8b9f3c8c35eb3d8c85cf168618b264c76bca687b.tar.xz nixlib-8b9f3c8c35eb3d8c85cf168618b264c76bca687b.tar.zst nixlib-8b9f3c8c35eb3d8c85cf168618b264c76bca687b.zip |
nixos/graphite: rename 'host' to 'listenAddress'
More descriptive option name.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/rename.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/monitoring/graphite.nix | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 6522cc240bb6..88d33aac7d0d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -16,6 +16,8 @@ with lib; (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 57abb959fdb7..c4ccde5d528d 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -77,7 +77,7 @@ in { type = types.bool; }; - host = mkOption { + listenAddress = mkOption { description = "Graphite web frontend listen address."; default = "127.0.0.1"; type = types.str; @@ -121,7 +121,7 @@ in { type = types.listOf types.str; }; - host = mkOption { + listenAddress = mkOption { description = "Graphite web service listen address."; default = "127.0.0.1"; type = types.str; @@ -292,7 +292,7 @@ in { }; graphiteUrl = mkOption { - default = "http://${cfg.web.host}:${toString cfg.web.port}"; + default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}"; description = "Host where graphite service runs."; type = types.str; }; @@ -337,7 +337,7 @@ in { graphiteUrl = mkOption { description = "URL to your graphite service."; - default = "http://${cfg.web.host}:${toString cfg.web.port}"; + default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}"; type = types.str; }; @@ -452,7 +452,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.python27Packages.waitress}/bin/waitress-serve \ - --host=${cfg.web.host} --port=${toString cfg.web.port} \ + --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} \ --call django.core.handlers.wsgi:WSGIHandler''; User = "graphite"; Group = "graphite"; @@ -494,7 +494,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.python27Packages.waitress}/bin/waitress-serve \ - --host=${cfg.api.host} --port=${toString cfg.api.port} \ + --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \ graphite_api.app:app ''; User = "graphite"; |