From 6b554dfe91e3afc0daff5b046f02e4ee8a829954 Mon Sep 17 00:00:00 2001 From: buildplan Date: Thu, 16 Oct 2025 19:31:13 +0100 Subject: [PATCH] change summary order --- du_setup.sh | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/du_setup.sh b/du_setup.sh index 6ddd18b..e0b1621 100644 --- a/du_setup.sh +++ b/du_setup.sh @@ -3233,21 +3233,8 @@ generate_summary() { printf '%s %s\n' "${CYAN}📜 The full execution log is available at:${NC}" "${BOLD}$LOG_FILE${NC}" printf '\n' - printf '%s\n' "${YELLOW}Environment Information${NC}" - printf '=====================================\n' - printf "%-20s %s\n" "Virtualization:" "${DETECTED_VIRT_TYPE:-unknown}" - printf "%-20s %s\n" "Manufacturer:" "${DETECTED_MANUFACTURER:-unknown}" - printf "%-20s %s\n" "Product:" "${DETECTED_PRODUCT:-unknown}" - if [[ "$IS_CLOUD_PROVIDER" == "true" ]]; then - printf "%-20s %s\n" "Environment:" "${YELLOW}Cloud VPS${NC}" - elif [[ "$DETECTED_VIRT_TYPE" == "none" ]]; then - printf "%-20s %s\n" "Environment:" "${GREEN}Bare Metal${NC}" - else - printf "%-20s %s\n" "Environment:" "${CYAN}Personal VM${NC}" - fi - printf '\n' - printf '%s\n' "${YELLOW}Final Service Status Check:${NC}" + printf '=====================================\n' for service in "$SSH_SERVICE" fail2ban chrony; do if systemctl is-active --quiet "$service"; then printf " %-20s ${GREEN}✓ Active${NC}\n" "$service" @@ -3295,6 +3282,7 @@ generate_summary() { # --- Main Configuration Summary --- printf '%s\n' "${YELLOW}Configuration Summary:${NC}" + printf '==========================================\n' printf " %-15s %s\n" "Admin User:" "$USERNAME" printf " %-15s %s\n" "Hostname:" "$SERVER_NAME" printf " %-15s %s\n" "SSH Port:" "$SSH_PORT" @@ -3381,8 +3369,23 @@ generate_summary() { fi printf '\n' + printf '%s\n' "${YELLOW}Environment Information${NC}" + printf '==========================================\n' + printf "%-20s %s\n" "Virtualization:" "${DETECTED_VIRT_TYPE:-unknown}" + printf "%-20s %s\n" "Manufacturer:" "${DETECTED_MANUFACTURER:-unknown}" + printf "%-20s %s\n" "Product:" "${DETECTED_PRODUCT:-unknown}" + if [[ "$IS_CLOUD_PROVIDER" == "true" ]]; then + printf "%-20s %s\n" "Environment:" "${YELLOW}Cloud VPS${NC}" + elif [[ "$DETECTED_VIRT_TYPE" == "none" ]]; then + printf "%-20s %s\n" "Environment:" "${GREEN}Bare Metal${NC}" + else + printf "%-20s %s\n" "Environment:" "${CYAN}Personal VM${NC}" + fi + printf '\n' + # --- Post-Reboot Verification Steps --- printf '%s\n' "${YELLOW}Post-Reboot Verification Steps:${NC}" + printf '==========================================\n' printf ' - SSH access:\n' if [[ "$SERVER_IP_V4" != "unknown" ]]; then printf " %-26s ${CYAN}%s${NC}\n" "- Using IPv4:" "ssh -p $SSH_PORT $USERNAME@$SERVER_IP_V4"