Fix operable scripts

input-output-hk · Mar 16, 2023 · 7e52f53 · 7e52f53
1 parent 8299b50
commit 7e52f53
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/deploy/nomadTasks.nix b/deploy/nomadTasks.nix
@@ -54,6 +54,7 @@ rec {
       policies = [ "marlowe-runtime" ];
     };
   };
+
   marlowe-chain-sync = {
     env = {
       HOST = "0.0.0.0";
@@ -67,8 +68,8 @@ rec {
     };
     template = dbTemplate "chainsync";
     config.image = ociNamer oci-images.marlowe-chain-sync;
-    config.ports = [ "marlowe-chain-sync" "marlowe_chain_sync_query" "marlowe_chain_sync_command" ];
-    service.port = "marlowe-chain-sync";
+    config.ports = [ "marlowe_chain_sync" "marlowe_chain_sync_query" "marlowe_chain_sync_command" ];
+    service.port = "marlowe_chain_sync";
     user = "0:0";
     driver = "docker";
     kill_signal = "SIGINT";
@@ -121,8 +122,8 @@ rec {
     };
     template = dbTemplate "marlowe";
     config.image = ociNamer oci-images.marlowe-sync;
-    config.ports = [ "marlowe-sync" "marlowe-header-sync" "marlowe-query" ];
-    service.port = "marlowe-sync";
+    config.ports = [ "marlowe_sync" "marlowe_header_sync" "marlowe_query" ];
+    service.port = "marlowe_sync";
     user = "0:0";
     driver = "docker";
     kill_signal = "SIGINT";
@@ -155,4 +156,26 @@ rec {
     resources.cpu = 2000;
     resources.memory = 4096;
   };
+
+  marlowe-proxy = {
+    env = {
+      HOST = "0.0.0.0";
+      PORT = "\${NOMAD_PORT_proxy}";
+      TX_HOST = "localhost";
+      TX_PORT = "\${NOMAD_PORT_tx}";
+      SYNC_HOST = "localhost";
+      MARLOWE_SYNC_PORT = "\${NOMAD_PORT_marlowe_sync}";
+      MARLOWE_HEADER_SYNC_PORT = "\${NOMAD_PORT_marlowe_header_sync}";
+      MARLOWE_QUERY_PORT = "\${NOMAD_PORT_marlowe_query}";
+    };
+    config.image = ociNamer oci-images.marlowe-proxy;
+    config.ports = [ "proxy" ];
+    service.port = "proxy";
+    user = "0:0";
+    driver = "docker";
+    kill_signal = "SIGINT";
+    kill_timeout = "30s";
+    resources.cpu = 2000;
+    resources.memory = 4096;
+  };
 }
diff --git a/deploy/operables.nix b/deploy/operables.nix
@@ -301,7 +301,7 @@ in
         --chain-sync-port "$MARLOWE_CHAIN_SYNC_PORT" \
         --chain-sync-query-port "$MARLOWE_CHAIN_SYNC_QUERY_PORT" \
         --chain-sync-command-port "$MARLOWE_CHAIN_SYNC_COMMAND_PORT" \
-        --chain-sync-host "$MARLOWE_CHAIN_SYNC_HOST" \
+        --chain-sync-host "$MARLOWE_CHAIN_SYNC_HOST"
     '';
   };