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

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

Browse Source 
More descriptive option name.
This commit is contained in:
Bjørn Forsman 2015-12-24 00:23:51 +01:00
parent 6c2fc3a5ac
commit 46924e77a2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/rename.nix
View File

@ -21,6 +21,7 @@ with lib;
(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" "shout" "host" ] [ "services" "shout" "listenAddress" ]) (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
(mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
(mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ]) (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
(mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])

4
nixos/modules/services/networking/sslh.nix
View File

@ -16,7 +16,7 @@ let
listen: listen:
( (
{ host: "${cfg.host}"; port: "${toString cfg.port}"; } { host: "${cfg.listenAddress}"; port: "${toString cfg.port}"; }
); );
${cfg.appendConfig} ${cfg.appendConfig}
@ -56,7 +56,7 @@ in
description = "PID file path for sslh daemon."; description = "PID file path for sslh daemon.";
}; };
host = mkOption { listenAddress = mkOption {
type = types.str; type = types.str;
default = config.networking.hostName; default = config.networking.hostName;
description = "Listening hostname."; description = "Listening hostname.";