entrypoint: ingore byron signing key if no deleg cert

IntersectMBO · May 17, 2022 · 6c99415 · 6c99415
1 parent c69ca59
commit 6c99415
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/nix/cardano/entrypoints.nix b/nix/cardano/entrypoints.nix
@@ -147,7 +147,7 @@
       local json
       json=$("''${cmd[@]}" | jq '.data.data')
 
-      echo "$json"|jq -e '."byron.cert.json"'  > "$BYRON_DELEG_CERT" || unset BYRON_DELEG_CERT
+      echo "$json"|jq -e '."byron.cert.json"'  > "$BYRON_DELEG_CERT" || unset BYRON_DELEG_CERT BYRON_SIGNING_KEY
       # we only want to fetch and set cold key if byron certificacte is passed to the node
       if [ -n "''${BYRON_DELEG_CERT:-}" ]; then
         # we use the shelley delegate as transport because it's already encoded for transport. Here we extract and decode to it's byron era bin format.

diff --git a/nix/cloud/nomadEnvs.nix b/nix/cloud/nomadEnvs.nix
@@ -13,6 +13,8 @@
   # Components per environment
   # -----------------------------------------------------------------------
   vasil-qa = mkComponents constants.envs.vasil-qa;
+  # TODO: pull this from nomadJob?
+  persistanceMount = "/persist";
 in
   with data-merge; {
     vasil-qa = {
@@ -88,6 +90,7 @@ in
           job.${jobname}.group.cardano.task.node = {
             # env.ENVIRONMENT = "testnet";
             # env.DEBUG_SLEEP = 6000;
+            env.DATA_DIR = persistanceMount + "/sp-1";
             env.CONSUL_KV_PATH = "config/cardano/vasil-qa";
             env.VAULT_KV_PATH = "kv/data/cardano/vasil-qa/sp-1";
             env.LOCAL_ROOTS_SRV_DNS = "_vasil-qa-${jobname}-node._tcp.service.consul";
@@ -109,6 +112,7 @@ in
           job.${jobname}.group.cardano.task.node = {
             # env.ENVIRONMENT = "testnet";
             # env.DEBUG_SLEEP = 6000;
+            env.DATA_DIR = persistanceMount + "/sp-2";
             env.CONSUL_KV_PATH = "config/cardano/vasil-qa";
             env.VAULT_KV_PATH = "kv/data/cardano/vasil-qa/sp-2";
             env.LOCAL_ROOTS_SRV_DNS = "_vasil-qa-${jobname}-node._tcp.service.consul";
@@ -130,6 +134,7 @@ in
           job.${jobname}.group.cardano.task.node = {
             # env.ENVIRONMENT = "testnet";
             # env.DEBUG_SLEEP = 6000;
+            env.DATA_DIR = persistanceMount + "/sp-3";
             env.CONSUL_KV_PATH = "config/cardano/vasil-qa";
             env.VAULT_KV_PATH = "kv/data/cardano/vasil-qa/sp-3";
             env.LOCAL_ROOTS_SRV_DNS = "_vasil-qa-${jobname}-node._tcp.service.consul";