summary refs log tree commit diff
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-12-24 00:22:47 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-12-24 00:22:47 +0100
commit6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79 (patch)
tree1d1afb41bf3104e35115a6b795d606a198d617c7
parent19aed49163da022eb0d7b6820bf19097fefa2dc3 (diff)
downloadnixpkgs-6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79.tar
nixpkgs-6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79.tar.gz
nixpkgs-6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79.tar.bz2
nixpkgs-6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79.tar.lz
nixpkgs-6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79.tar.xz
nixpkgs-6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79.tar.zst
nixpkgs-6c2fc3a5ac7e059cefa2cd0248acc9a2cb88be79.zip
nixos/shout: rename 'host' to 'listenAddress'
More descriptive option name.
-rw-r--r--nixos/modules/rename.nix1
-rw-r--r--nixos/modules/services/networking/shout.nix4
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 87aa25f883f..266aa13e60b 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -20,6 +20,7 @@ with lib;
     (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" "shout" "host" ] [ "services" "shout" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
 
diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix
index fe3cba8f149..f069fe7bec9 100644
--- a/nixos/modules/services/networking/shout.nix
+++ b/nixos/modules/services/networking/shout.nix
@@ -19,7 +19,7 @@ in {
       '';
     };
 
-    host = mkOption {
+    listenAddress = mkOption {
       type = types.string;
       default = "0.0.0.0";
       description = "IP interface to listen on for http connections.";
@@ -66,7 +66,7 @@ in {
         "${pkgs.shout}/bin/shout"
         (if cfg.private then "--private" else "--public")
         "--port" (toString cfg.port)
-        "--host" (toString cfg.host)
+        "--host" (toString cfg.listenAddress)
         "--home" shoutHome
       ];
       serviceConfig = {