dayhoff-tools 1.3.18__tar.gz → 1.3.20__tar.gz

{dayhoff_tools-1.3.18 → dayhoff_tools-1.3.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.3.18
+Version: 1.3.20
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.3.18 → dayhoff_tools-1.3.20}/dayhoff_tools/cli/engine_commands.py

@@ -381,7 +381,7 @@ def update_ssh_config_entry(engine_name: str, instance_id: str, username: str):
     new_entry = f"""
 Host {engine_name} {SSH_MANAGED_COMMENT}
     HostName {instance_id}
-    User {username}
+    User ec2-user
     ProxyCommand sh -c "aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'"
 """
 
@@ -632,7 +632,7 @@ def engine_status(
             res = ssm.send_command(
                 InstanceIds=[engine["instance_id"]],
                 DocumentName="AWS-RunShellScript",
-                Parameters={"commands": ["cat /var/run/engine-health.json || true"], "executionTimeout": ["10"]},
+                Parameters={"commands": ["cat /opt/dayhoff/state/engine-health.json 2>/dev/null || cat /var/run/engine-health.json 2>/dev/null || true"], "executionTimeout": ["10"]},
             )
             cid = res["Command"]["CommandId"]
             time.sleep(1)
@@ -903,7 +903,7 @@ def config_ssh(
                     "",
                     f"Host {engine['name']} {SSH_MANAGED_COMMENT}",
                     f"    HostName {engine['instance_id']}",
-                    f"    User {username}",
+                    f"    User ec2-user",
                     f"    ProxyCommand sh -c \"aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p'\"",
                 ]
             )
@@ -2090,8 +2090,8 @@ def debug_engine(
     
     # Check multiple files and systemd status
     checks = [
-        ("Stage file", "cat /var/run/engine-init.stage 2>/dev/null || echo 'MISSING'"),
-        ("Health file", "cat /var/run/engine-health.json 2>/dev/null || echo 'MISSING'"),
+        ("Stage file", "cat /opt/dayhoff/state/engine-init.stage 2>/dev/null || cat /var/run/engine-init.stage 2>/dev/null || echo 'MISSING'"),
+        ("Health file", "cat /opt/dayhoff/state/engine-health.json 2>/dev/null || cat /var/run/engine-health.json 2>/dev/null || echo 'MISSING'"),
         ("Sentinel file", "ls -la /opt/dayhoff/first_boot_complete.sentinel 2>/dev/null || echo 'MISSING'"),
         ("Setup service", "systemctl status setup-aws-vm.service --no-pager || echo 'Service not found'"),
         ("Bootstrap log tail", "tail -20 /var/log/engine-setup.log 2>/dev/null || echo 'No log'"),

{dayhoff_tools-1.3.18 → dayhoff_tools-1.3.20}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.3.18"
+version = "1.3.20"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}