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

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

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

2
nixos/modules/rename.nix
View File

@ -16,6 +16,8 @@ with lib;
(mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
(mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "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" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
(mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])

12
nixos/modules/services/monitoring/graphite.nix
View File

@ -77,7 +77,7 @@ in {
type = types.bool; type = types.bool;
}; };
host = mkOption { listenAddress = mkOption {
description = "Graphite web frontend listen address."; description = "Graphite web frontend listen address.";
default = "127.0.0.1"; default = "127.0.0.1";
type = types.str; type = types.str;
@ -121,7 +121,7 @@ in {
type = types.listOf types.str; type = types.listOf types.str;
}; };
host = mkOption { listenAddress = mkOption {
description = "Graphite web service listen address."; description = "Graphite web service listen address.";
default = "127.0.0.1"; default = "127.0.0.1";
type = types.str; type = types.str;
@ -292,7 +292,7 @@ in {
}; };
graphiteUrl = mkOption { 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."; description = "Host where graphite service runs.";
type = types.str; type = types.str;
}; };
@ -337,7 +337,7 @@ in {
graphiteUrl = mkOption { graphiteUrl = mkOption {
description = "URL to your graphite service."; 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; type = types.str;
}; };
@ -452,7 +452,7 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${pkgs.python27Packages.waitress}/bin/waitress-serve \ ${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''; --call django.core.handlers.wsgi:WSGIHandler'';
User = "graphite"; User = "graphite";
Group = "graphite"; Group = "graphite";
@ -494,7 +494,7 @@ in {
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${pkgs.python27Packages.waitress}/bin/waitress-serve \ ${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 graphite_api.app:app
''; '';
User = "graphite"; User = "graphite";