summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2017-04-24 20:43:16 +0200
committerEdward Tjörnhammar <ed@cflags.cc>2017-04-24 20:49:13 +0200
commit027734526554051a1acefd0bcc2e191a9c63a091 (patch)
tree47abba8dede441eb20ecd2adca83b27209989423 /nixos
parentc90998d5cf8b8d7983f5f547546ee9ef2ad11688 (diff)
downloadnixpkgs-027734526554051a1acefd0bcc2e191a9c63a091.tar
nixpkgs-027734526554051a1acefd0bcc2e191a9c63a091.tar.gz
nixpkgs-027734526554051a1acefd0bcc2e191a9c63a091.tar.bz2
nixpkgs-027734526554051a1acefd0bcc2e191a9c63a091.tar.lz
nixpkgs-027734526554051a1acefd0bcc2e191a9c63a091.tar.xz
nixpkgs-027734526554051a1acefd0bcc2e191a9c63a091.tar.zst
nixpkgs-027734526554051a1acefd0bcc2e191a9c63a091.zip
nixos, i2pd: remove, no longer needed, extip hack
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/networking/i2pd.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 24a3196bed4..4e176353fc2 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -8,8 +8,6 @@ let
 
   homeDir = "/var/lib/i2pd";
 
-  extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sLf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
-
   mkEndpointOpt = name: addr: port: {
     enable = mkEnableOption name;
     name = mkOption {
@@ -152,9 +150,8 @@ let
 
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
-    ${if isNull cfg.extIp then extip else ""}
     ${pkgs.i2pd}/bin/i2pd \
-      --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \
+      ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \
       --conf=${i2pdConf} \
       --tunconf=${i2pdTunnelConf}
   '';