Merge #22

22: Add nodeId parameter to byron-proxy script and nixos service r=disassembler a=disassembler Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
input-output-hk · Aug 14, 2019 · 76b5abc · 76b5abc
2 parents c763433 + eab2c4c
commit 76b5abc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/nix/byron-proxy-scripts.nix b/nix/byron-proxy-scripts.nix
@@ -17,13 +17,14 @@ let
     config = {
       proxyHost = "127.0.0.1";
       proxyPort = 7777;
+      nodeId = null;
       topologyFile = mkTopology envConfig.relays;
       loggingConfig = ../cfg/logging.yaml;
       pbftThreshold = null;
     } // envConfig
       // customConfig;
   in with config; pkgs.writeScript "byron-proxy-${environment}" ''
-    exec ${byronProxy}/bin/cardano-byron-proxy +RTS -T -RTS --database-path db-byron-proxy-${environment} --index-path index-byron-proxy-${environment} --configuration-file ${configuration}/lib/configuration.yaml --configuration-key ${envConfig.confKey} --topology ${topologyFile} --logger-config ${loggingConfig} --local-addr [${proxyHost}]:${toString proxyPort} ${lib.optionalString (pbftThreshold != null) "--pbft-threshold ${pbftThreshold}"}
+    exec ${byronProxy}/bin/cardano-byron-proxy +RTS -T -RTS --database-path db-byron-proxy-${environment} --index-path index-byron-proxy-${environment} --configuration-file ${configuration}/lib/configuration.yaml --configuration-key ${envConfig.confKey} --topology ${topologyFile} --logger-config ${loggingConfig} --local-addr [${proxyHost}]:${toString proxyPort} ${lib.optionalString (pbftThreshold != null) "--pbft-threshold ${pbftThreshold}"} ${lib.optionalString (nodeId != null) "--node-id ${nodeId}"}
   '';
   configuration = cardanoConfig;
 

diff --git a/nix/nixos/byron-proxy.nix b/nix/nixos/byron-proxy.nix
@@ -17,9 +17,13 @@ in {
       default = 7777;
     };
     proxyHost = mkOption {
-      type = types.string;
+      type = types.str;
       default = "127.0.0.1";
     };
+    nodeId = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+    };
     topologyFile = mkOption {
       type = types.nullOr types.path;
       default = null;
@@ -47,7 +51,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       script = let
         customConfig = {
-          inherit (cfg) proxyHost proxyPort;
+          inherit (cfg) proxyHost proxyPort nodeId;
         } // lib.optionalAttrs (cfg.topologyFile != null) { inherit (cfg) topologyFile; };
         byronScripts = (import ../.. { inherit customConfig; }).scripts.byron;
       in ''${byronScripts.proxy.${cfg.environment}}'';