From a9d370966389d324ae24ee3376a357ac06a5a944 Mon Sep 17 00:00:00 2001
From: cliffmccarthy <16453869+cliffmccarthy@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:08:22 -0500
Subject: [PATCH] refactor: Move curl installation from IrohDeployer to
 ChatmailDeployer

- The 'curl' program is used in TurnDeployer and IrohDeployer, so it
  makes more sense to install it at the beginning in ChatmailDeployer,
  rather than have each thing that uses it install it separately.
---
 cmdeploy/src/cmdeploy/__init__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py
index e03f5537..e4e110f7 100644
--- a/cmdeploy/src/cmdeploy/__init__.py
+++ b/cmdeploy/src/cmdeploy/__init__.py
@@ -906,11 +906,6 @@ class IrohDeployer(Deployer):
             ),
         }[host.get_fact(facts.server.Arch)]
 
-        apt.packages(
-            name="Install curl",
-            packages=["curl"],
-        )
-
         existing_sha256sum = host.get_fact(Sha256File, "/usr/local/bin/iroh-relay")
         if existing_sha256sum != sha256sum:
             server.shell(
@@ -1063,6 +1058,11 @@ class ChatmailDeployer(Deployer):
         apt.update(name="apt update", cache_time=24 * 3600)
         apt.upgrade(name="upgrade apt packages", auto_remove=True)
 
+        apt.packages(
+            name="Install curl",
+            packages=["curl"],
+        )
+
         apt.packages(
             name="Install rsync",
             packages=["rsync"],