diff options
| author | SLNOS <anonymous@wired> | 2017-03-01 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2017-08-25 12:49:10 +0000 |
| commit | b42a107bc60d072daedd5bed7106e62990543740 (patch) | |
| tree | 1431229300528e76230452f2cade0c06090e2e6b | |
| parent | c21d434d1b74523588fbd50080ec1cd59243599a (diff) | |
| download | nixpkgs-b42a107bc60d072daedd5bed7106e62990543740.tar nixpkgs-b42a107bc60d072daedd5bed7106e62990543740.tar.gz nixpkgs-b42a107bc60d072daedd5bed7106e62990543740.tar.bz2 nixpkgs-b42a107bc60d072daedd5bed7106e62990543740.tar.lz nixpkgs-b42a107bc60d072daedd5bed7106e62990543740.tar.xz nixpkgs-b42a107bc60d072daedd5bed7106e62990543740.tar.zst nixpkgs-b42a107bc60d072daedd5bed7106e62990543740.zip | |
nixos: i2pd: rename extIp -> address to harmonize with tor
| -rw-r--r-- | nixos/modules/rename.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/services/networking/i2pd.nix | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 08146d1f568..27dde17dbed 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -17,8 +17,9 @@ 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" "i2pd" "extIp" ] [ "services" "i2pd" "address" ]) (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ]) + (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ]) (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ]) (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ]) (mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ]) diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index e16ef3beae5..0463498359b 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -151,7 +151,7 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh ${pkgs.i2pd}/bin/i2pd \ - ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \ + ${if isNull cfg.address then "" else "--host="+cfg.address} \ --conf=${i2pdConf} \ --tunconf=${i2pdTunnelConf} ''; @@ -176,11 +176,11 @@ in ''; }; - extIp = mkOption { + address = mkOption { type = with types; nullOr str; default = null; description = '' - Your external IP. + Your external IP or hostname. ''; }; |