summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-12-24 00:23:51 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-12-24 00:23:51 +0100
commit46924e77a2c1c9bf0f018a8dc9d878958e243d20 (patch)
treeb6feb5538b18885ae2cca0e3450ef86476eacd59 /nixos
parent6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79 (diff)
downloadnixlib-46924e77a2c1c9bf0f018a8dc9d878958e243d20.tar
nixlib-46924e77a2c1c9bf0f018a8dc9d878958e243d20.tar.gz
nixlib-46924e77a2c1c9bf0f018a8dc9d878958e243d20.tar.bz2
nixlib-46924e77a2c1c9bf0f018a8dc9d878958e243d20.tar.lz
nixlib-46924e77a2c1c9bf0f018a8dc9d878958e243d20.tar.xz
nixlib-46924e77a2c1c9bf0f018a8dc9d878958e243d20.tar.zst
nixlib-46924e77a2c1c9bf0f018a8dc9d878958e243d20.zip
nixos/sslh: rename 'host' to 'listenAddress'
More descriptive option name.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/rename.nix1
-rw-r--r--nixos/modules/services/networking/sslh.nix4
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.";