External/du_setup
1
0
Fork 0
mirror of https://github.com/buildplan/du_setup.git synced 2025-12-29 16:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve print formatting

Browse Source 
modified print statements to use printf for better formatting.
This commit is contained in:
buildplan
2025-10-16 10:08:03 +01:00
committed by GitHub
parent f02d1d5ca4
commit 6733e9957b
1 changed files with 72 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

145
du_setup.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Debian and Ubuntu Server Hardening Interactive Script # Debian and Ubuntu Server Hardening Interactive Script
# Version: 0.70 | 2025-10-14 # Version: 0.70 | 2025-10-18
# Changelog: # Changelog:
# - v0.70: Option to remove cloud VPS provider packages (like cloud-init). # - v0.70: Option to remove cloud VPS provider packages (like cloud-init).
# New operational modes: --cleanup-preview, --cleanup-only, --skip-cleanup. # New operational modes: --cleanup-preview, --cleanup-only, --skip-cleanup.
@@ -218,38 +218,38 @@ log() {
print_header() { print_header() {
[[ $VERBOSE == false ]] && return [[ $VERBOSE == false ]] && return
echo -e "${CYAN}╔═════════════════════════════════════════════════════════════════╗${NC}" printf '%s\n' "${CYAN}╔═════════════════════════════════════════════════════════════════╗${NC}"
echo -e "${CYAN}║ ║${NC}" printf '%s\n' "${CYAN}║ ║${NC}"
echo -e "${CYAN}║ DEBIAN/UBUNTU SERVER SETUP AND HARDENING SCRIPT ║${NC}" printf '%s\n' "${CYAN}║ DEBIAN/UBUNTU SERVER SETUP AND HARDENING SCRIPT ║${NC}"
echo -e "${CYAN}║ v0.70 | 2025-10-14 ║${NC}" printf '%s\n' "${CYAN}║ v0.70 | 2025-10-17 ║${NC}"
echo -e "${CYAN}║ ║${NC}" printf '%s\n' "${CYAN}║ ║${NC}"
echo -e "${CYAN}╚═════════════════════════════════════════════════════════════════╝${NC}" printf '%s\n' "${CYAN}╚═════════════════════════════════════════════════════════════════╝${NC}"
echo printf '\n'
} }
print_section() { print_section() {
[[ $VERBOSE == false ]] && return [[ $VERBOSE == false ]] && return
echo -e "\n${BLUE}▓▓▓ $1 ▓▓▓${NC}" | tee -a "$LOG_FILE" printf '\n%s\n' "${BLUE}▓▓▓ $1 ▓▓▓${NC}" | tee -a "$LOG_FILE"
echo -e "${BLUE}$(printf '═%.0s' {1..65})${NC}" printf '%s\n' "${BLUE}$(printf '═%.0s' {1..65})${NC}"
} }
print_success() { print_success() {
[[ $VERBOSE == false ]] && return [[ $VERBOSE == false ]] && return
echo -e "${GREEN}✓ $1${NC}" | tee -a "$LOG_FILE" printf '%s\n' "${GREEN}✓ $1${NC}" | tee -a "$LOG_FILE"
} }
print_error() { print_error() {
echo -e "${RED}✗ $1${NC}" | tee -a "$LOG_FILE" printf '%s\n' "${RED}✗ $1${NC}" | tee -a "$LOG_FILE"
} }
print_warning() { print_warning() {
[[ $VERBOSE == false ]] && return [[ $VERBOSE == false ]] && return
echo -e "${YELLOW}⚠ $1${NC}" | tee -a "$LOG_FILE" printf '%s\n' "${YELLOW}⚠ $1${NC}" | tee -a "$LOG_FILE"
} }
print_info() { print_info() {
[[ $VERBOSE == false ]] && return [[ $VERBOSE == false ]] && return
echo -e "${PURPLE}ℹ $1${NC}" | tee -a "$LOG_FILE" printf '%s\n' "${PURPLE}ℹ $1${NC}" | tee -a "$LOG_FILE"
} }
# --- CLEANUP HELPER FUNCTIONS --- # --- CLEANUP HELPER FUNCTIONS ---
@@ -258,12 +258,11 @@ execute_check() {
"$@" "$@"
} }
execute_command() { execute_command() {
local cmd_string="$*" local cmd_string="$*"
if [[ "$CLEANUP_PREVIEW" == "true" ]]; then if [[ "$CLEANUP_PREVIEW" == "true" ]]; then
echo -e "${CYAN}[PREVIEW]${NC} Would execute: ${BOLD}$cmd_string${NC}" | tee -a "$LOG_FILE" printf '%s Would execute: %s\n' "${CYAN}[PREVIEW]${NC}" "${BOLD}$cmd_string${NC}" | tee -a "$LOG_FILE"
return 0 return 0
else else
"$@" "$@"
@@ -489,18 +488,18 @@ cleanup_provider_packages() {
detect_environment detect_environment
# Display environment information # Display environment information
echo -e "${CYAN}=== Environment Detection ===${NC}" printf '%s\n' "${CYAN}=== Environment Detection ===${NC}"
echo "Virtualization Type: ${DETECTED_VIRT_TYPE:-unknown}" printf 'Virtualization Type: %s\n' "${DETECTED_VIRT_TYPE:-unknown}"
echo "System Manufacturer: ${DETECTED_MANUFACTURER:-unknown}" printf 'System Manufacturer: %s\n' "${DETECTED_MANUFACTURER:-unknown}"
echo "Product Name: ${DETECTED_PRODUCT:-unknown}" printf 'Product Name: %s\n' "${DETECTED_PRODUCT:-unknown}"
echo "Environment Type: ${ENVIRONMENT_TYPE:-unknown}" printf 'Environment Type: %s\n' "${ENVIRONMENT_TYPE:-unknown}"
if [[ -n "${DETECTED_BIOS_VENDOR}" && "${DETECTED_BIOS_VENDOR}" != "unknown" ]]; then if [[ -n "${DETECTED_BIOS_VENDOR}" && "${DETECTED_BIOS_VENDOR}" != "unknown" ]]; then
echo "BIOS Vendor: ${DETECTED_BIOS_VENDOR}" printf 'BIOS Vendor: %s\n' "${DETECTED_BIOS_VENDOR}"
fi fi
if [[ -n "${DETECTED_PROVIDER_NAME}" ]]; then if [[ -n "${DETECTED_PROVIDER_NAME}" ]]; then
echo "Detected Provider: ${DETECTED_PROVIDER_NAME}" printf 'Detected Provider: %s\n' "${DETECTED_PROVIDER_NAME}"
fi fi
echo printf '\n'
# Determine recommendation based on three-way detection # Determine recommendation based on three-way detection
local CLEANUP_RECOMMENDED=false local CLEANUP_RECOMMENDED=false
@@ -512,50 +511,50 @@ cleanup_provider_packages() {
commercial-cloud) commercial-cloud)
CLEANUP_RECOMMENDED=true CLEANUP_RECOMMENDED=true
DEFAULT_ANSWER="y" DEFAULT_ANSWER="y"
echo -e "${YELLOW}☁ Commercial Cloud VPS Detected${NC}" printf '%s\n' "${YELLOW}☁ Commercial Cloud VPS Detected${NC}"
if [[ -n "${DETECTED_PROVIDER_NAME}" ]]; then if [[ -n "${DETECTED_PROVIDER_NAME}" ]]; then
echo -e "Provider: ${CYAN}${DETECTED_PROVIDER_NAME}${NC}" printf 'Provider: %s\n' "${CYAN}${DETECTED_PROVIDER_NAME}${NC}"
fi fi
echo "This is a commercial VPS from an external provider." printf 'This is a commercial VPS from an external provider.\n'
RECOMMENDATION_TEXT="Provider cleanup is ${BOLD}RECOMMENDED${NC} for security." RECOMMENDATION_TEXT="Provider cleanup is ${BOLD}RECOMMENDED${NC} for security."
echo -e "$RECOMMENDATION_TEXT" printf '%s\n' "$RECOMMENDATION_TEXT"
echo "Providers may install monitoring agents, pre-configured users, and management tools." printf 'Providers may install monitoring agents, pre-configured users, and management tools.\n'
;; ;;
uncertain-kvm) uncertain-kvm)
CLEANUP_RECOMMENDED=false CLEANUP_RECOMMENDED=false
DEFAULT_ANSWER="n" DEFAULT_ANSWER="n"
echo -e "${YELLOW}⚠ KVM/QEMU Virtualization Detected (Uncertain)${NC}" printf '%s\n' "${YELLOW}⚠ KVM/QEMU Virtualization Detected (Uncertain)${NC}"
echo "This environment could be:" printf 'This environment could be:\n'
echo " ${CYAN}•${NC} A commercial cloud provider VPS (Hetzner, Vultr, OVH, smaller providers)" printf ' %s A commercial cloud provider VPS (Hetzner, Vultr, OVH, smaller providers)\n' "${CYAN}•${NC}"
echo " ${CYAN}•${NC} A personal VM on Proxmox, KVM, or QEMU" printf ' %s A personal VM on Proxmox, KVM, or QEMU\n' "${CYAN}•${NC}"
echo " ${CYAN}•${NC} A VPS from a regional/unlisted provider" printf ' %s A VPS from a regional/unlisted provider\n' "${CYAN}•${NC}"
echo "" printf '\n'
RECOMMENDATION_TEXT="Cleanup is ${BOLD}OPTIONAL${NC} - review packages carefully before proceeding." RECOMMENDATION_TEXT="Cleanup is ${BOLD}OPTIONAL${NC} - review packages carefully before proceeding."
echo -e "$RECOMMENDATION_TEXT" printf '%s\n' "$RECOMMENDATION_TEXT"
echo "If this is a commercial VPS, cleanup is recommended." printf 'If this is a commercial VPS, cleanup is recommended.\n'
echo "If you control the hypervisor (Proxmox/KVM), cleanup is optional." printf 'If you control the hypervisor (Proxmox/KVM), cleanup is optional.\n'
;; ;;
personal-vm) personal-vm)
CLEANUP_RECOMMENDED=false CLEANUP_RECOMMENDED=false
DEFAULT_ANSWER="n" DEFAULT_ANSWER="n"
echo -e "${CYAN}ℹ Personal/Private Virtualization Detected${NC}" printf '%s\n' "${CYAN}ℹ Personal/Private Virtualization Detected${NC}"
if [[ -n "${DETECTED_PROVIDER_NAME}" ]]; then if [[ -n "${DETECTED_PROVIDER_NAME}" ]]; then
echo -e "Platform: ${CYAN}${DETECTED_PROVIDER_NAME}${NC}" printf 'Platform: %s\n' "${CYAN}${DETECTED_PROVIDER_NAME}${NC}"
fi fi
echo "This appears to be a personal VM (VirtualBox, VMware Workstation, etc.)" printf 'This appears to be a personal VM (VirtualBox, VMware Workstation, etc.)\n'
RECOMMENDATION_TEXT="Provider cleanup is ${BOLD}NOT RECOMMENDED${NC} for trusted environments." RECOMMENDATION_TEXT="Provider cleanup is ${BOLD}NOT RECOMMENDED${NC} for trusted environments."
echo -e "$RECOMMENDATION_TEXT" printf '%s\n' "$RECOMMENDATION_TEXT"
echo "If you control the hypervisor/host, you likely don't need cleanup." printf 'If you control the hypervisor/host, you likely don'\''t need cleanup.\n'
;; ;;
bare-metal) bare-metal)
echo -e "${GREEN}✓ Bare Metal Server Detected${NC}" printf '%s\n' "${GREEN}✓ Bare Metal Server Detected${NC}"
echo "This appears to be a physical (bare metal) server." printf 'This appears to be a physical (bare metal) server.\n'
RECOMMENDATION_TEXT="Provider cleanup is ${BOLD}NOT NEEDED${NC} for bare metal." RECOMMENDATION_TEXT="Provider cleanup is ${BOLD}NOT NEEDED${NC} for bare metal."
echo -e "$RECOMMENDATION_TEXT" printf '%s\n' "$RECOMMENDATION_TEXT"
echo "No virtualization layer detected - skipping cleanup." printf 'No virtualization layer detected - skipping cleanup.\n'
log "Provider package cleanup skipped: bare metal server detected." log "Provider package cleanup skipped: bare metal server detected."
return 0 return 0
;; ;;
@@ -563,14 +562,14 @@ cleanup_provider_packages() {
uncertain-xen|unknown|*) uncertain-xen|unknown|*)
CLEANUP_RECOMMENDED=false CLEANUP_RECOMMENDED=false
DEFAULT_ANSWER="n" DEFAULT_ANSWER="n"
echo -e "${YELLOW}⚠ Virtualization Environment: Uncertain${NC}" printf '%s\n' "${YELLOW}⚠ Virtualization Environment: Uncertain${NC}"
echo "Could not definitively identify the hosting provider or environment." printf 'Could not definitively identify the hosting provider or environment.\n'
RECOMMENDATION_TEXT="Cleanup is ${BOLD}OPTIONAL${NC} - proceed with caution." RECOMMENDATION_TEXT="Cleanup is ${BOLD}OPTIONAL${NC} - proceed with caution."
echo -e "$RECOMMENDATION_TEXT" printf '%s\n' "$RECOMMENDATION_TEXT"
echo "Review packages carefully before removing anything." printf 'Review packages carefully before removing anything.\n'
;; ;;
esac esac
echo printf '\n'
# Decision point based on environment and flags # Decision point based on environment and flags
if [[ "$CLEANUP_PREVIEW" == "false" ]] && [[ "$CLEANUP_ONLY" == "false" ]]; then if [[ "$CLEANUP_PREVIEW" == "false" ]] && [[ "$CLEANUP_ONLY" == "false" ]]; then
@@ -1492,33 +1491,33 @@ setup_user() {
chmod 600 "$TEMP_KEY_FILE" chmod 600 "$TEMP_KEY_FILE"
chown root:root "$TEMP_KEY_FILE" chown root:root "$TEMP_KEY_FILE"
echo printf '\n'
echo -e "${YELLOW}⚠ SECURITY WARNING: The SSH key pair below is your only chance to access '$USERNAME' via SSH.${NC}" printf '%s\n' "${YELLOW}⚠ SECURITY WARNING: The SSH key pair below is your only chance to access '$USERNAME' via SSH.${NC}"
echo -e "${YELLOW}⚠ Anyone with the private key can access your server. Secure it immediately.${NC}" printf '%s\n' "${YELLOW}⚠ Anyone with the private key can access your server. Secure it immediately.${NC}"
echo printf '\n'
echo -e "${PURPLE}ℹ ACTION REQUIRED: Save the keys to your local machine:${NC}" printf '%s\n' "${PURPLE}ℹ ACTION REQUIRED: Save the keys to your local machine:${NC}"
echo -e "${CYAN}1. Save the PRIVATE key to ~/.ssh/${USERNAME}_key:${NC}" printf '%s\n' "${CYAN}1. Save the PRIVATE key to ~/.ssh/${USERNAME}_key:${NC}"
echo -e "${RED} vvvv PRIVATE KEY BELOW THIS LINE vvvv ${NC}" printf '%s\n' "${RED} vvvv PRIVATE KEY BELOW THIS LINE vvvv ${NC}"
cat "$TEMP_KEY_FILE" cat "$TEMP_KEY_FILE"
echo -e "${RED} ^^^^ PRIVATE KEY ABOVE THIS LINE ^^^^^ ${NC}" printf '%s\n' "${RED} ^^^^ PRIVATE KEY ABOVE THIS LINE ^^^^^ ${NC}"
echo printf '\n'
echo -e "${CYAN}2. Save the PUBLIC key to verify or use elsewhere:${NC}" printf '%s\n' "${CYAN}2. Save the PUBLIC key to verify or use elsewhere:${NC}"
echo "====SSH PUBLIC KEY BELOW THIS LINE====" printf '====SSH PUBLIC KEY BELOW THIS LINE====\n'
cat "$SSH_DIR/id_ed25519_user.pub" cat "$SSH_DIR/id_ed25519_user.pub"
echo "====SSH PUBLIC KEY END====" printf '====SSH PUBLIC KEY END====\n'
echo printf '\n'
echo -e "${CYAN}3. On your local machine, set permissions for the private key:${NC}" printf '%s\n' "${CYAN}3. On your local machine, set permissions for the private key:${NC}"
echo -e "${CYAN} chmod 600 ~/.ssh/${USERNAME}_key${NC}" printf '%s\n' "${CYAN} chmod 600 ~/.ssh/${USERNAME}_key${NC}"
echo -e "${CYAN}4. Connect to the server using:${NC}" printf '%s\n' "${CYAN}4. Connect to the server using:${NC}"
if [[ "$SERVER_IP_V4" != "unknown" ]]; then if [[ "$SERVER_IP_V4" != "unknown" ]]; then
echo -e "${CYAN} ssh -i ~/.ssh/${USERNAME}_key -p $SSH_PORT $USERNAME@$SERVER_IP_V4${NC}" printf '%s\n' "${CYAN} ssh -i ~/.ssh/${USERNAME}_key -p $SSH_PORT $USERNAME@$SERVER_IP_V4${NC}"
fi fi
if [[ "$SERVER_IP_V6" != "not available" ]]; then if [[ "$SERVER_IP_V6" != "not available" ]]; then
echo -e "${CYAN} ssh -i ~/.ssh/${USERNAME}_key -p $SSH_PORT $USERNAME@$SERVER_IP_V6${NC}" printf '%s\n' "${CYAN} ssh -i ~/.ssh/${USERNAME}_key -p $SSH_PORT $USERNAME@$SERVER_IP_V6${NC}"
fi fi
echo printf '\n'
echo -e "${PURPLE}ℹ The private key file ($TEMP_KEY_FILE) will be deleted after this step.${NC}" printf '%s\n' "${PURPLE}ℹ The private key file ($TEMP_KEY_FILE) will be deleted after this step.${NC}"
read -rp "$(echo -e "${CYAN}Press Enter after you have saved the keys securely...${NC}")" read -rp "$(printf '%s' "${CYAN}Press Enter after you have saved the keys securely...${NC}")"
print_info "Temporary key file deleted." print_info "Temporary key file deleted."
LOCAL_KEY_ADDED=true LOCAL_KEY_ADDED=true
fi fi