From 46924e77a2c1c9bf0f018a8dc9d878958e243d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 24 Dec 2015 00:23:51 +0100 Subject: [PATCH] nixos/sslh: rename 'host' to 'listenAddress' More descriptive option name. --- nixos/modules/rename.nix | 1 + nixos/modules/services/networking/sslh.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 266aa13e60b3..f406c29753f0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -21,6 +21,7 @@ with lib; (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ]) (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ]) (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix index c87fe914df8b..bd584a3a85d3 100644 --- a/nixos/modules/services/networking/sslh.nix +++ b/nixos/modules/services/networking/sslh.nix @@ -16,7 +16,7 @@ let listen: ( - { host: "${cfg.host}"; port: "${toString cfg.port}"; } + { host: "${cfg.listenAddress}"; port: "${toString cfg.port}"; } ); ${cfg.appendConfig} @@ -56,7 +56,7 @@ in description = "PID file path for sslh daemon."; }; - host = mkOption { + listenAddress = mkOption { type = types.str; default = config.networking.hostName; description = "Listening hostname.";