Merge #98

98: Adjusts for jorm 0.9.x and bumps iohk-nix r=disassembler a=johnalotoski Co-authored-by: Michael Fellinger <michael.fellinger@iohk.io>
input-output-hk · Jun 24, 2020 · fddf5df · fddf5df
2 parents a76dc93 + 78d9160
commit fddf5df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/nix/sources.json b/nix/sources.json
@@ -41,10 +41,10 @@
         "homepage": null,
         "owner": "input-output-hk",
         "repo": "iohk-nix",
-        "rev": "fd4f751b200b14dde7e4de62bd06094b2861e02a",
-        "sha256": "00k91yhv0ksi6q7siiar3djl3pd0qbg41wynshyfsyy61sgwd03q",
+        "rev": "b2b9c8e24d694a9c7ccf76ea175eba8493f3ab2a",
+        "sha256": "17bms19x7k12pd009qa8wyyk3sgk7cxpgp6spc7czn0lw3i5ma9f",
         "type": "tarball",
-        "url": "https://github.com/input-output-hk/iohk-nix/archive/fd4f751b200b14dde7e4de62bd06094b2861e02a.tar.gz",
+        "url": "https://github.com/input-output-hk/iohk-nix/archive/b2b9c8e24d694a9c7ccf76ea175eba8493f3ab2a.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "js-chain-libs": {

diff --git a/nixos/jormungandr.nix b/nixos/jormungandr.nix
@@ -15,13 +15,6 @@ let
           /ip4/127.0.0.1/tcp/8080 or /ip6/::1/tcp/8080
         '';
       };
-
-      id = mkOption {
-        type = types.str;
-        description = ''
-          public key of the node
-        '';
-      };
     };
   };
 in {
@@ -286,6 +279,11 @@ in {
         '';
       };
 
+      allowPrivateAddresses = mkOption {
+        type = types.nullOr types.bool;
+        default = true;
+      };
+
       rest.listenAddress = mkOption {
         type = types.nullOr types.str;
         default = "127.0.0.1:8607";
@@ -363,7 +361,6 @@ in {
       script = let
         mapPeers = map (peer: {
           address = peer.address;
-          id = peer.id;
         });
 
         configJson = builtins.toFile "config.yaml" (builtins.toJSON ({
@@ -399,6 +396,8 @@ in {
               };
             };
 
+            allow_private_addresses = cfg.allowPrivateAddresses;
+
             topics_of_interest = cfg.topicsOfInterest;
             listen_address = cfg.listenAddress;
             max_connections = cfg.maxConnections;