From b56e11ee83a866941d5ba6f6bb68e32dd2e3d950 Mon Sep 17 00:00:00 2001 From: Yury Kossakovsky Date: Thu, 21 Aug 2025 18:10:43 -0600 Subject: [PATCH] Refactor Cloudflare Tunnel configuration and update prompts - Removed the dependency on the Caddy service in docker-compose.yml for the Cloudflare Tunnel. - Updated prompts in the secret generation script to clarify that leaving the Cloudflare Tunnel Token empty will skip the input. --- docker-compose.yml | 2 -- scripts/03_generate_secrets.sh | 4 ++-- scripts/04_wizard.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index caeb172..a708735 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -244,8 +244,6 @@ services: command: tunnel --no-autoupdate run environment: - TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN} - depends_on: - - caddy logging: driver: "json-file" options: diff --git a/scripts/03_generate_secrets.sh b/scripts/03_generate_secrets.sh index 36159b1..36384c1 100755 --- a/scripts/03_generate_secrets.sh +++ b/scripts/03_generate_secrets.sh @@ -296,11 +296,11 @@ if [[ -v existing_env_vars[CLOUDFLARE_TUNNEL_TOKEN] ]]; then else log_info "Found empty Cloudflare Tunnel Token in .env. You can provide one now or leave empty." echo "" - read -p "Cloudflare Tunnel Token: " CLOUDFLARE_TUNNEL_TOKEN + read -p "Cloudflare Tunnel Token (leave empty to skip): " CLOUDFLARE_TUNNEL_TOKEN fi else echo "" - read -p "Cloudflare Tunnel Token: " CLOUDFLARE_TUNNEL_TOKEN + read -p "Cloudflare Tunnel Token (leave empty to skip): " CLOUDFLARE_TUNNEL_TOKEN fi if [ -n "$CLOUDFLARE_TUNNEL_TOKEN" ]; then diff --git a/scripts/04_wizard.sh b/scripts/04_wizard.sh index 55c91e2..0985476 100755 --- a/scripts/04_wizard.sh +++ b/scripts/04_wizard.sh @@ -105,7 +105,7 @@ done # Use whiptail to display the checklist CHOICES=$(whiptail --title "Service Selection Wizard" --checklist \ - "Choose the services you want to deploy.\nUse ARROW KEYS to navigate, SPACEBAR to select/deselect, ENTER to confirm." 32 90 20 \ + "Choose the services you want to deploy.\nUse ARROW KEYS to navigate, SPACEBAR to select/deselect, ENTER to confirm." 32 90 21 \ "${services[@]}" \ 3>&1 1>&2 2>&3)