From 9fbe7796775882174202c9167d249ce4fb76a53c Mon Sep 17 00:00:00 2001
From: Yury Kossakovsky <kossakovsky93@gmail.com>
Date: Mon, 5 May 2025 14:14:16 -0600
Subject: [PATCH] Refactor caddy check in 03_generate_secrets.sh

- Moved the caddy availability check to a later point in the script after the installation process.
- Improved script flow by ensuring caddy is checked only after attempting to install it, enhancing user experience.
---
 scripts/03_generate_secrets.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/03_generate_secrets.sh b/scripts/03_generate_secrets.sh
index 2c0925b..b846bd6 100755
--- a/scripts/03_generate_secrets.sh
+++ b/scripts/03_generate_secrets.sh
@@ -11,12 +11,6 @@ if ! command -v openssl &> /dev/null; then
     exit 1
 fi
 
-# Check for caddy
-if ! command -v caddy &> /dev/null; then
-    log_error "caddy could not be found. Please ensure it is installed and available in your PATH." >&2
-    exit 1
-fi
-
 # --- Configuration ---
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 PROJECT_ROOT="$( cd "$SCRIPT_DIR/.." &> /dev/null && pwd )"
@@ -61,6 +55,12 @@ curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --yes --
 curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
 apt install -y caddy
 
+# Check for caddy
+if ! command -v caddy &> /dev/null; then
+    log_error "caddy could not be found. Please ensure it is installed and available in your PATH." >&2
+    exit 1
+fi
+
 # Prompt for the domain name
 while true; do
     read -p "Enter the primary domain name for your services (e.g., example.com): " DOMAIN