summary refs log tree commit diff
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-12-20 18:27:29 +0100
committermakefu <github@syntax-fehler.de>2017-01-13 10:19:32 +0100
commite9c6cf02e6886bfc91f3bb866184e95054199ff1 (patch)
treeded9e07e981e0e4fc5c6cdb7025056932ae6784e
parent10303e9e47525389334222a441010edebe972513 (diff)
downloadnixpkgs-e9c6cf02e6886bfc91f3bb866184e95054199ff1.tar
nixpkgs-e9c6cf02e6886bfc91f3bb866184e95054199ff1.tar.gz
nixpkgs-e9c6cf02e6886bfc91f3bb866184e95054199ff1.tar.bz2
nixpkgs-e9c6cf02e6886bfc91f3bb866184e95054199ff1.tar.lz
nixpkgs-e9c6cf02e6886bfc91f3bb866184e95054199ff1.tar.xz
nixpkgs-e9c6cf02e6886bfc91f3bb866184e95054199ff1.tar.zst
nixpkgs-e9c6cf02e6886bfc91f3bb866184e95054199ff1.zip
services.logstash: rename address to listenAddress
-rw-r--r--nixos/modules/rename.nix1
-rw-r--r--nixos/modules/services/logging/logstash.nix4
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a89ce2c743d..41af40965c6 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -18,6 +18,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index d9b37039255..c9477b9e3ab 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -63,7 +63,7 @@ in
         description = "Enable the logstash web interface.";
       };
 
-      address = mkOption {
+      listenAddress = mkOption {
         type = types.str;
         default = "0.0.0.0";
         description = "Address on which to start webserver.";
@@ -147,7 +147,7 @@ in
               ${cfg.outputConfig}
             }
           ''} " +
-          ops cfg.enableWeb "-- web -a ${cfg.address} -p ${cfg.port}";
+          ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}";
       };
     };
   };