From af851dd5dab5d8bef166d3957d811a84cdf79d9b Mon Sep 17 00:00:00 2001 From: buildplan Date: Fri, 4 Jul 2025 15:42:46 +0100 Subject: [PATCH 1/7] if tailscale config skip, revise summary --- du_setup.sh | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/du_setup.sh b/du_setup.sh index efb9b6d..0b19fae 100644 --- a/du_setup.sh +++ b/du_setup.sh @@ -1166,17 +1166,19 @@ install_tailscale() { return 0 fi print_section "Tailscale VPN Installation and Configuration" +#-- if command -v tailscale >/dev/null 2>&1; then - print_info "Tailscale already installed." if systemctl is-active --quiet tailscaled && tailscale ip >/dev/null 2>&1; then local TS_IPS TS_IPV4 TS_IPS=$(tailscale ip 2>/dev/null || echo "Unknown") TS_IPV4=$(echo "$TS_IPS" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -1 || echo "Unknown") - print_success "Tailscale service is active and connected. Node IPv4 in tailnet: $TS_IPV4" + print_success "Service tailscaled is active and connected. Node IPv4 in tailnet: $TS_IPV4" echo "$TS_IPS" > /tmp/tailscale_ips.txt - return 0 else - print_warning "Tailscale installed but service is not active or not connected." + print_warning "Service tailscaled is installed but not active or connected." + FAILED_SERVICES+=("tailscaled") + TS_COMMAND=$(grep "Tailscale connection failed: tailscale up" "$LOG_FILE" | tail -1 | sed 's/.*Tailscale connection failed: //') + TS_COMMAND=${TS_COMMAND:-""} # Empty if no failure, not default command fi else print_info "Installing Tailscale..." @@ -2120,17 +2122,26 @@ generate_summary() { echo -e " Remote Backup: ${RED}Not configured${NC}" fi if command -v tailscale >/dev/null 2>&1; then + local TS_CONFIGURED=false + if [[ -f /tmp/tailscale_ips.txt ]] && grep -qE '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' /tmp/tailscale_ips.txt 2>/dev/null; then + TS_CONFIGURED=true + fi + if $TS_CONFIGURED; then local TS_SERVER=$(cat /tmp/tailscale_server 2>/dev/null || echo "https://controlplane.tailscale.com") local TS_IPS_RAW=$(cat /tmp/tailscale_ips.txt 2>/dev/null || echo "Not connected") - # --- FIX: Format IPs to be on a single line --- local TS_IPS=$(echo "$TS_IPS_RAW" | paste -sd ", " -) local TS_FLAGS=$(cat /tmp/tailscale_flags 2>/dev/null || echo "None") - echo -e " Tailscale: ${GREEN}Enabled${NC}" - printf " %-16s%s\n" "- Server:" "$TS_SERVER" - printf " %-16s%s\n" "- Tailscale IPs:" "$TS_IPS" - printf " %-16s%s\n" "- Flags:" "$TS_FLAGS" + echo -e " Tailscale: ${GREEN}Configured and connected${NC}" else - echo -e " Tailscale: ${RED}Not configured${NC}" + echo -e " Tailscale: ${YELLOW}Installed but not configured${NC}" + print_info "You can configure Tailscale later by running: sudo tailscale up" + print_info "For custom servers, use: sudo tailscale up --login-server=" + fi + printf " %-16s%s\n" "- Server:" "${TS_SERVER:-Not set}" + printf " %-16s%s\n" "- Tailscale IPs:" "${TS_IPS:-Not connected}" + printf " %-16s%s\n" "- Flags:" "${TS_FLAGS:-None}" + else + echo -e " Tailscale: ${RED}Not installed${NC}" fi if [[ "$AUDIT_RAN" == true ]]; then echo -e " Security Audit: ${GREEN}Performed${NC}" From f7c4f3d53cb1b7884cda5910ff227d11c6ea3f93 Mon Sep 17 00:00:00 2001 From: buildplan Date: Fri, 4 Jul 2025 15:45:34 +0100 Subject: [PATCH 2/7] update hash --- README.md | 4 ++-- du_setup.sh.sha256 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 82bf26b..4c79cc4 100644 --- a/README.md +++ b/README.md @@ -75,12 +75,12 @@ sha256sum du_setup.sh Compare the output hash to the one below. They must match exactly. -`5545a41d9fbda243b94d9cbae534d09eb5f00179939f19e102cad707c9182127` +`df0852f2090d5a6c9f359540c047848a5256fe17b329af2fe64eb46c9c7b5356` Or echo the hash to check, it should output: `du_setup.sh: OK` ``` -echo 5545a41d9fbda243b94d9cbae534d09eb5f00179939f19e102cad707c9182127 du_setup.sh | sha256sum --check - +echo df0852f2090d5a6c9f359540c047848a5256fe17b329af2fe64eb46c9c7b5356 du_setup.sh | sha256sum --check - ``` ### 3\. Run the Script diff --git a/du_setup.sh.sha256 b/du_setup.sh.sha256 index cd034b4..4c499b6 100644 --- a/du_setup.sh.sha256 +++ b/du_setup.sh.sha256 @@ -1 +1 @@ -5545a41d9fbda243b94d9cbae534d09eb5f00179939f19e102cad707c9182127 du_setup.sh +df0852f2090d5a6c9f359540c047848a5256fe17b329af2fe64eb46c9c7b5356 du_setup.sh From 566998daf28010ffdc3476f648c80ab288b22a95 Mon Sep 17 00:00:00 2001 From: buildplan <170122315+buildplan@users.noreply.github.com> Date: Fri, 4 Jul 2025 15:48:51 +0100 Subject: [PATCH 3/7] if tailscale config skip, revise summary --- du_setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/du_setup.sh b/du_setup.sh index 0b19fae..ea5f60b 100644 --- a/du_setup.sh +++ b/du_setup.sh @@ -1166,7 +1166,6 @@ install_tailscale() { return 0 fi print_section "Tailscale VPN Installation and Configuration" -#-- if command -v tailscale >/dev/null 2>&1; then if systemctl is-active --quiet tailscaled && tailscale ip >/dev/null 2>&1; then local TS_IPS TS_IPV4 From 75010fbff57a12a15c223d9ec880e03bde60ec8b Mon Sep 17 00:00:00 2001 From: buildplan Date: Fri, 4 Jul 2025 16:06:35 +0100 Subject: [PATCH 4/7] fixing tailscale config --- du_setup.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/du_setup.sh b/du_setup.sh index ea5f60b..8062f5c 100644 --- a/du_setup.sh +++ b/du_setup.sh @@ -2068,17 +2068,21 @@ generate_summary() { fi local TS_COMMAND="" if command -v tailscale >/dev/null 2>&1; then - if systemctl is-active --quiet tailscaled && tailscale ip >/dev/null 2>&1; then - local TS_IPS TS_IPV4 - TS_IPS=$(tailscale ip 2>/dev/null || echo "Unknown") - TS_IPV4=$(echo "$TS_IPS" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -1 || echo "Unknown") - print_success "Service tailscaled is active and connected." - echo "$TS_IPS" > /tmp/tailscale_ips.txt - else + if systemctl is-active --quiet tailscaled && tailscale ip >/dev/null 2>&1; then + local TS_IPS TS_IPV4 + TS_IPS=$(tailscale ip 2>/dev/null || echo "Unknown") + TS_IPV4=$(echo "$TS_IPS" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -1 || echo "Unknown") + print_success "Service tailscaled is active and connected." + echo "$TS_IPS" > /tmp/tailscale_ips.txt + else + if grep -q "Tailscale connection failed: tailscale up" "$LOG_FILE"; then print_error "Service tailscaled is NOT active" FAILED_SERVICES+=("tailscaled") TS_COMMAND=$(grep "Tailscale connection failed: tailscale up" "$LOG_FILE" | tail -1 | sed 's/.*Tailscale connection failed: //') - TS_COMMAND=${TS_COMMAND:-"tailscale up --operator=$USERNAME"} + TS_COMMAND=${TS_COMMAND:-""} + else + print_info "Service tailscaled is installed but not configured." + TS_COMMAND="" fi fi if [[ "$AUDIT_RAN" == true ]]; then From 1e3a8863c997707d5834af397b05176de846a783 Mon Sep 17 00:00:00 2001 From: buildplan Date: Fri, 4 Jul 2025 16:07:43 +0100 Subject: [PATCH 5/7] update hash --- README.md | 4 ++-- du_setup.sh.sha256 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c79cc4..ed99873 100644 --- a/README.md +++ b/README.md @@ -75,12 +75,12 @@ sha256sum du_setup.sh Compare the output hash to the one below. They must match exactly. -`df0852f2090d5a6c9f359540c047848a5256fe17b329af2fe64eb46c9c7b5356` +`5d8a2af48ec382ac4aaca420dd9268f67c332d1f6d9e88167c6939f3c6505752` Or echo the hash to check, it should output: `du_setup.sh: OK` ``` -echo df0852f2090d5a6c9f359540c047848a5256fe17b329af2fe64eb46c9c7b5356 du_setup.sh | sha256sum --check - +echo 5d8a2af48ec382ac4aaca420dd9268f67c332d1f6d9e88167c6939f3c6505752 du_setup.sh | sha256sum --check - ``` ### 3\. Run the Script diff --git a/du_setup.sh.sha256 b/du_setup.sh.sha256 index 4c499b6..c2eea7d 100644 --- a/du_setup.sh.sha256 +++ b/du_setup.sh.sha256 @@ -1 +1 @@ -df0852f2090d5a6c9f359540c047848a5256fe17b329af2fe64eb46c9c7b5356 du_setup.sh +5d8a2af48ec382ac4aaca420dd9268f67c332d1f6d9e88167c6939f3c6505752 du_setup.sh From 7b362fe58723ff11e7533a49f16a44b78a36a1e2 Mon Sep 17 00:00:00 2001 From: buildplan Date: Fri, 4 Jul 2025 16:10:20 +0100 Subject: [PATCH 6/7] fixing tailscale config --- du_setup.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/du_setup.sh b/du_setup.sh index 8062f5c..7b9903a 100644 --- a/du_setup.sh +++ b/du_setup.sh @@ -2068,13 +2068,13 @@ generate_summary() { fi local TS_COMMAND="" if command -v tailscale >/dev/null 2>&1; then - if systemctl is-active --quiet tailscaled && tailscale ip >/dev/null 2>&1; then - local TS_IPS TS_IPV4 - TS_IPS=$(tailscale ip 2>/dev/null || echo "Unknown") - TS_IPV4=$(echo "$TS_IPS" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -1 || echo "Unknown") - print_success "Service tailscaled is active and connected." - echo "$TS_IPS" > /tmp/tailscale_ips.txt - else + if systemctl is-active --quiet tailscaled && tailscale ip >/dev/null 2>&1; then + local TS_IPS TS_IPV4 + TS_IPS=$(tailscale ip 2>/dev/null || echo "Unknown") + TS_IPV4=$(echo "$TS_IPS" | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | head -1 || echo "Unknown") + print_success "Service tailscaled is active and connected." + echo "$TS_IPS" > /tmp/tailscale_ips.txt + else if grep -q "Tailscale connection failed: tailscale up" "$LOG_FILE"; then print_error "Service tailscaled is NOT active" FAILED_SERVICES+=("tailscaled") From b3c4fd6adf5edd5e0eaf96f7b99850dde32de3bc Mon Sep 17 00:00:00 2001 From: buildplan Date: Fri, 4 Jul 2025 16:11:49 +0100 Subject: [PATCH 7/7] update hash --- README.md | 4 ++-- du_setup.sh.sha256 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ed99873..72f602d 100644 --- a/README.md +++ b/README.md @@ -75,12 +75,12 @@ sha256sum du_setup.sh Compare the output hash to the one below. They must match exactly. -`5d8a2af48ec382ac4aaca420dd9268f67c332d1f6d9e88167c6939f3c6505752` +`c88ccdaa4cbf836f98bb70a976398248de34f56a8f3e74ba853494a3140abd6b` Or echo the hash to check, it should output: `du_setup.sh: OK` ``` -echo 5d8a2af48ec382ac4aaca420dd9268f67c332d1f6d9e88167c6939f3c6505752 du_setup.sh | sha256sum --check - +echo c88ccdaa4cbf836f98bb70a976398248de34f56a8f3e74ba853494a3140abd6b du_setup.sh | sha256sum --check - ``` ### 3\. Run the Script diff --git a/du_setup.sh.sha256 b/du_setup.sh.sha256 index c2eea7d..d2a6078 100644 --- a/du_setup.sh.sha256 +++ b/du_setup.sh.sha256 @@ -1 +1 @@ -5d8a2af48ec382ac4aaca420dd9268f67c332d1f6d9e88167c6939f3c6505752 du_setup.sh +c88ccdaa4cbf836f98bb70a976398248de34f56a8f3e74ba853494a3140abd6b du_setup.sh