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

fix summary output

Browse Source
This commit is contained in:
Ali
2025-06-28 17:42:48 +01:00
parent 4b28623290
commit ed1075b8c7
1 changed files with 79 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
setup_harden_debian_ubuntu.sh
View File

@@ -1091,18 +1091,26 @@ EOF
if [[ "$n_choice" == "2" ]]; then if [[ "$n_choice" == "2" ]]; then
NOTIFICATION_SETUP="discord" NOTIFICATION_SETUP="discord"
read -rp "$(echo -e "${CYAN}Enter Discord Webhook URL: ${NC}")" DISCORD_WEBHOOK read -rp "$(echo -e "${CYAN}Enter Discord Webhook URL: ${NC}")" DISCORD_WEBHOOK
if [[ ! "$DISCORD_WEBHOOK" =~ ^https://discord.com/api/webhooks/ ]]; then print_error "Invalid Discord webhook URL."; return 1; fi if [[ ! "$DISCORD_WEBHOOK" =~ ^https://discord.com/api/webhooks/ ]]; then
print_error "Invalid Discord webhook URL."
log "Invalid Discord webhook URL provided."
return 1
fi
else else
NOTIFICATION_SETUP="ntfy" NOTIFICATION_SETUP="ntfy"
read -rp "$(echo -e "${CYAN}Enter ntfy URL/topic (e.g., https://ntfy.sh/my-backups): ${NC}")" NTFY_URL read -rp "$(echo -e "${CYAN}Enter ntfy URL/topic (e.g., https://ntfy.sh/my-backups): ${NC}")" NTFY_URL
read -rp "$(echo -e "${CYAN}Enter ntfy Access Token (optional): ${NC}")" NTFY_TOKEN read -rp "$(echo -e "${CYAN}Enter ntfy Access Token (optional): ${NC}")" NTFY_TOKEN
if [[ ! "$NTFY_URL" =~ ^https?:// ]]; then print_error "Invalid ntfy URL."; return 1; fi if [[ ! "$NTFY_URL" =~ ^https?:// ]]; then
print_error "Invalid ntfy URL."
log "Invalid ntfy URL provided."
return 1
fi
fi fi
fi fi
# --- Generate the Backup Script --- # --- Generate the Backup Script ---
print_info "Generating the backup script at $BACKUP_SCRIPT_PATH..." print_info "Generating the backup script at $BACKUP_SCRIPT_PATH..."
tee "$BACKUP_SCRIPT_PATH" > /dev/null <<EOF if ! tee "$BACKUP_SCRIPT_PATH" > /dev/null <<EOF
#!/bin/bash #!/bin/bash
# Generated by server setup script on $(date) # Generated by server setup script on $(date)
set -Euo pipefail; umask 077 set -Euo pipefail; umask 077
@@ -1120,7 +1128,12 @@ NTFY_URL="${NTFY_URL}"
NTFY_TOKEN="${NTFY_TOKEN}" NTFY_TOKEN="${NTFY_TOKEN}"
DISCORD_WEBHOOK="${DISCORD_WEBHOOK}" DISCORD_WEBHOOK="${DISCORD_WEBHOOK}"
EOF EOF
tee -a "$BACKUP_SCRIPT_PATH" > /dev/null <<'EOF' then
print_error "Failed to create backup script at $BACKUP_SCRIPT_PATH."
log "Failed to create backup script at $BACKUP_SCRIPT_PATH."
return 1
fi
if ! tee -a "$BACKUP_SCRIPT_PATH" > /dev/null <<'EOF'
# --- BACKUP SCRIPT LOGIC --- # --- BACKUP SCRIPT LOGIC ---
send_notification() { send_notification() {
local status="$1" message="$2" title color local status="$1" message="$2" title color
@@ -1153,12 +1166,51 @@ else
send_notification "FAILURE" "$message" send_notification "FAILURE" "$message"
fi fi
EOF EOF
chmod 700 "$BACKUP_SCRIPT_PATH" then
print_error "Failed to append to backup script at $BACKUP_SCRIPT_PATH."
log "Failed to append to backup script at $BACKUP_SCRIPT_PATH."
return 1
fi
if ! chmod 700 "$BACKUP_SCRIPT_PATH"; then
print_error "Failed to set permissions on $BACKUP_SCRIPT_PATH."
log "Failed to set permissions on $BACKUP_SCRIPT_PATH."
return 1
fi
print_success "Backup script created." print_success "Backup script created."
# --- Configure Cron Job --- # --- Configure Cron Job ---
print_info "Configuring root cron job..." print_info "Configuring root cron job..."
(crontab -u root -l 2>/dev/null || true | grep -v "$CRON_MARKER"; echo "$CRON_SCHEDULE $BACKUP_SCRIPT_PATH $CRON_MARKER") | crontab -u root - # Ensure crontab is writable
local CRON_DIR="/var/spool/cron/crontabs"
mkdir -p "$CRON_DIR"
chmod 1730 "$CRON_DIR"
chown root:crontab "$CRON_DIR"
# Validate inputs
if [[ -z "$CRON_SCHEDULE" || -z "$BACKUP_SCRIPT_PATH" ]]; then
print_error "Cron schedule or backup script path is empty."
log "Cron configuration failed: CRON_SCHEDULE='$CRON_SCHEDULE', BACKUP_SCRIPT_PATH='$BACKUP_SCRIPT_PATH'"
return 1
fi
if [[ ! -f "$BACKUP_SCRIPT_PATH" ]]; then
print_error "Backup script $BACKUP_SCRIPT_PATH does not exist."
log "Cron configuration failed: Backup script $BACKUP_SCRIPT_PATH not found."
return 1
fi
# Create temporary cron file
local TEMP_CRON
TEMP_CRON=$(mktemp)
if ! crontab -u root -l 2>/dev/null | grep -v "$CRON_MARKER" > "$TEMP_CRON"; then
print_warning "No existing crontab found or error reading crontab. Creating new one."
: > "$TEMP_CRON" # Create empty file
fi
echo "$CRON_SCHEDULE $BACKUP_SCRIPT_PATH $CRON_MARKER" >> "$TEMP_CRON"
if ! crontab -u root "$TEMP_CRON" 2>&1 | tee -a "$LOG_FILE"; then
print_error "Failed to configure cron job."
log "Cron configuration failed: Error updating crontab."
rm -f "$TEMP_CRON"
return 1
fi
rm -f "$TEMP_CRON"
print_success "Backup cron job scheduled: $CRON_SCHEDULE" print_success "Backup cron job scheduled: $CRON_SCHEDULE"
log "Backup configuration completed." log "Backup configuration completed."
} }
@@ -1336,6 +1388,7 @@ final_cleanup() {
log "Final system cleanup completed." log "Final system cleanup completed."
} }
```bash
generate_summary() { generate_summary() {
print_section "Setup Complete!" print_section "Setup Complete!"
print_info "Checking critical services..." print_info "Checking critical services..."
@@ -1372,26 +1425,26 @@ generate_summary() {
echo -e " Hostname: $SERVER_NAME" echo -e " Hostname: $SERVER_NAME"
echo -e " SSH Port: $SSH_PORT" echo -e " SSH Port: $SSH_PORT"
echo -e " Server IP: $SERVER_IP" echo -e " Server IP: $SERVER_IP"
if [[ -f /root/backup.sh ]]; then if [[ -f /root/run_backup.sh ]]; then
local CRON_SCHEDULE=$(crontab -u root -l 2>/dev/null | grep -F "/root/backup.sh" | awk '{print $1, $2, $3, $4, $5}' || echo "Not configured") local CRON_SCHEDULE=$(crontab -u root -l 2>/dev/null | grep -F "/root/run_backup.sh" | awk '{print $1, $2, $3, $4, $5}' || echo "Not configured")
local NOTIFICATION_STATUS="None" local NOTIFICATION_STATUS="None"
local BACKUP_DEST=$(grep "^BACKUP_DEST=" /root/backup.sh | cut -d'"' -f2 || echo "Unknown") local BACKUP_DEST=$(grep "^REMOTE_DEST=" /root/run_backup.sh | cut -d'"' -f2 || echo "Unknown")
local BACKUP_PORT=$(grep "^SSH_PORT=" /root/backup.sh | cut -d'"' -f2 || echo "Unknown") local BACKUP_PORT=$(grep "^SSH_PORT=" /root/run_backup.sh | cut -d'"' -f2 || echo "Unknown")
local REMOTE_BACKUP_DIR=$(grep "^REMOTE_DIR=" /root/backup.sh | cut -d'"' -f2 || echo "Unknown") local REMOTE_BACKUP_PATH=$(grep "^REMOTE_PATH=" /root/run_backup.sh | cut -d'"' -f2 || echo "Unknown")
if grep -q "NTFY_URL" /root/backup.sh; then if grep -q "NTFY_URL=" /root/run_backup.sh && ! grep -q 'NTFY_URL=""' /root/run_backup.sh; then
NOTIFICATION_STATUS="ntfy" NOTIFICATION_STATUS="ntfy"
elif grep -q "DISCORD_WEBHOOK" /root/backup.sh; then elif grep -q "DISCORD_WEBHOOK=" /root/run_backup.sh && ! grep -q 'DISCORD_WEBHOOK=""' /root/run_backup.sh; then
NOTIFICATION_STATUS="Discord" NOTIFICATION_STATUS="Discord"
fi fi
echo -e " Remote Backup: Enabled" echo -e " Remote Backup: Enabled"
echo -e " - Backup Script: /root/backup.sh" echo -e " - Backup Script: /root/run_backup.sh"
echo -e " - Destination: $BACKUP_DEST" echo -e " - Destination: $BACKUP_DEST"
echo -e " - SSH Port: $BACKUP_PORT" echo -e " - SSH Port: $BACKUP_PORT"
echo -e " - Remote Path: $REMOTE_BACKUP_DIR" echo -e " - Remote Path: $REMOTE_BACKUP_PATH"
echo -e " - Cron Schedule: $CRON_SCHEDULE" echo -e " - Cron Schedule: $CRON_SCHEDULE"
echo -e " - Notifications: $NOTIFICATION_STATUS" echo -e " - Notifications: $NOTIFICATION_STATUS"
else else
echo -e " Remote Backup: Not configured" echo -e " Remote Backup: Not configured"
fi fi
echo echo
echo -e "${PURPLE}Log File: ${LOG_FILE}${NC}" echo -e "${PURPLE}Log File: ${LOG_FILE}${NC}"
@@ -1410,12 +1463,12 @@ generate_summary() {
if command -v tailscale >/dev/null 2>&1; then if command -v tailscale >/dev/null 2>&1; then
echo -e " - Tailscale status: tailscale status" echo -e " - Tailscale status: tailscale status"
fi fi
if [[ -f /root/backup.sh ]]; then if [[ -f /root/run_backup.sh ]]; then
echo -e " - Remote Backup:" echo -e " - Remote Backup:"
echo -e " - Verify SSH key: cat /root/.ssh/id_ed25519.pub" echo -e " - Verify SSH key: cat /root/.ssh/id_ed25519.pub"
echo -e " - Copy key if needed: ssh-copy-id -p $BACKUP_PORT -s $BACKUP_DEST" echo -e " - Copy key if needed: ssh-copy-id -p $BACKUP_PORT -s $BACKUP_DEST"
echo -e " - Test backup: sudo /root/backup.sh" echo -e " - Test backup: sudo /root/run_backup.sh"
echo -e " - Check logs: sudo less /var/log/backup_*.log" echo -e " - Check logs: sudo less /var/log/backup_rsync.log"
fi fi
print_warning "\nACTION REQUIRED: If remote backup is enabled, ensure the root SSH key is copied to the destination server." print_warning "\nACTION REQUIRED: If remote backup is enabled, ensure the root SSH key is copied to the destination server."
print_warning "A reboot is required to apply all changes cleanly." print_warning "A reboot is required to apply all changes cleanly."