FailedProxy/Varaverk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying v1 framework again

Browse Source
This commit is contained in:
FailedProxy
2026-03-27 18:02:36 +00:00
parent 48ef63310f
commit 1b9f584fb9
2 changed files with 117 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rsync/rsync.sh
+52 -66
View File
@@ -20,15 +20,12 @@ set -e
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# Load configs & helpers
source "$SCRIPT_DIR/../Master.conf" source "$SCRIPT_DIR/../Master.conf"
source "$SCRIPT_DIR/../common.sh" source "$SCRIPT_DIR/../common.sh"
# ---------------------------- parse_args "$@"
# INPUT HANDLING (FIXED)
# ----------------------------
# If first argument is NOT a flag or VAR=VALUE, treat it as DIRECTORY # ----------------------------- INPUT -----------------------------
if [[ -z "$DIRECTORY" ]]; then if [[ -z "$DIRECTORY" ]]; then
if [[ "${1:-}" != "" && "${1:-}" != --* && "${1:-}" != *=* ]]; then if [[ "${1:-}" != "" && "${1:-}" != --* && "${1:-}" != *=* ]]; then
DIRECTORY="$1" DIRECTORY="$1"
@@ -36,16 +33,13 @@ if [[ -z "$DIRECTORY" ]]; then
fi fi
fi fi
if [[ -z "$DIRECTORY" ]]; then [[ -z "$DIRECTORY" ]] && error "Missing directory" && exit 1
echo "Usage: $0 <directory-to-sync> [--dry-run] [--status] [VAR=value ...]"
exit 1
fi
# ----------------------------- Host & IP ----------------------------- # ----------------------------- HOST -----------------------------
detect_hosts detect_hosts
resolve_remote_ip resolve_remote_ip
# ----------------------------- Profile ----------------------------- # ----------------------------- PROFILE -----------------------------
PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]') PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')
MAX_RSYNC_PROCS=${PROFILE_MAX_PROCS[$PROFILE_NAME]:-$MAX_RSYNC_PROCS} MAX_RSYNC_PROCS=${PROFILE_MAX_PROCS[$PROFILE_NAME]:-$MAX_RSYNC_PROCS}
@@ -57,113 +51,105 @@ RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP} SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}}) EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}})
# ----------------------------- Status Mode ----------------------------- # ----------------------------- STATUS MODE -----------------------------
if [[ "$SHOW_STATUS" == true ]]; then if [[ "$SHOW_STATUS" == true ]]; then
show_status show_status
exit 0 exit 0
fi fi
# ----------------------------- HEADER -----------------------------
# ----------------------------- User Info ----------------------------- echo
echo "============================================================" echo "$ICON_RUN Sync Starting"
echo " Sync Job Starting" echo "--------------------------------------------"
echo "------------------------------------------------------------"
echo "Source: $DIRECTORY" echo "Source: $DIRECTORY"
echo "Destination: $REMOTE_SERVER:$DIRECTORY" echo "Destination: $REMOTE_SERVER:$DIRECTORY"
echo "Profile: $PROFILE_NAME" echo "Profile: $PROFILE_NAME"
echo "Dry Run: $DRY_RUN" echo "Dry Run: $DRY_RUN"
echo "============================================================" echo "--------------------------------------------"
log "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT" # ----------------------------- RSYNC LIMIT -----------------------------
log "Containers: ${CRITICAL_CONTAINER_NAMES[*]}"
log "Excludes: ${EXCLUDE_DIRS[*]}"
# ----------------------------- Rsync Wait -----------------------------
wait_for_rsync() { wait_for_rsync() {
for attempt in $(seq 1 "$RETRY_COUNT"); do for i in $(seq 1 "$RETRY_COUNT"); do
RSYNC_COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true) RSYNC_COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
if [ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]; then
echo "Waiting for available rsync slot... ($RSYNC_COUNT running)" if [[ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]]; then
log "RSYNC_COUNT=$RSYNC_COUNT >= MAX=$MAX_RSYNC_PROCS" warn "Waiting for rsync slot ($RSYNC_COUNT)"
sleep "$SLEEP" sleep "$SLEEP"
else else
return 0 return 0
fi fi
done done
echo "Too many rsync processes, exiting."
exit 1 error "Too many rsync processes"
} }
# ----------------------------- Main ----------------------------- # ----------------------------- SUMMARY -----------------------------
main() { print_summary() {
echo "" echo
echo "🔍 Checking remote connectivity..." echo "================ SUMMARY ================"
echo "Directory: $DIRECTORY"
echo "Profile: $PROFILE_NAME"
echo "Remote: $REMOTE_SERVER"
echo "Duration: ${DURATION:-unknown}s"
echo "Status: $1"
echo "Dry Run: $DRY_RUN"
echo "========================================"
}
# ----------------------------- MAIN -----------------------------
main() {
echo "$ICON_GEAR Checking remote..."
for i in $(seq 1 "$RETRY_COUNT"); do for i in $(seq 1 "$RETRY_COUNT"); do
if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then
echo "✅ Remote server reachable" success "Remote reachable"
break break
fi fi
echo "⚠️ Remote down, retrying in $SLEEP seconds..." warn "Retrying ($i/$RETRY_COUNT)"
sleep "$SLEEP" sleep "$SLEEP"
done done
if ! ping -c 1 "$REMOTE_SERVER" &>/dev/null; then [[ ! $(ping -c 1 "$REMOTE_SERVER" &>/dev/null) ]] && error "Remote unreachable"
echo "❌ Remote server unreachable. Exiting."
exit 1
fi
wait_for_rsync wait_for_rsync
echo "" echo "$ICON_STOP Stopping containers..."
echo "🛑 Stopping containers on remote..."
stop_containers stop_containers
echo "" echo "$ICON_GEAR Building rsync opts..."
echo "📦 Building rsync options..."
get_rsync_opts get_rsync_opts
for ex in "${EXCLUDE_DIRS[@]}"; do for ex in "${EXCLUDE_DIRS[@]}"; do
RSYNC_OPTS+=(--exclude="$ex") RSYNC_OPTS+=(--exclude="$ex")
done done
[ "$DRY_RUN" = true ] && RSYNC_OPTS+=("--dry-run") [[ "$DRY_RUN" == true ]] && RSYNC_OPTS+=("--dry-run")
log "Final rsync opts: ${RSYNC_OPTS[*]}" echo "$ICON_RUN Running rsync..."
echo "" START=$(date +%s)
echo "🚀 Starting rsync..."
for attempt in $(seq 1 "$RETRY_COUNT"); do
echo "Attempt $attempt/$RETRY_COUNT"
for i in $(seq 1 "$RETRY_COUNT"); do
if rsync "${RSYNC_OPTS[@]}" \ if rsync "${RSYNC_OPTS[@]}" \
-e "ssh -i \"$SSH_KEY\" -T -o Compression=no -o IPQoS=throughput" \ -e "ssh -i $SSH_KEY -T -o Compression=no -o IPQoS=throughput" \
"$DIRECTORY" "root@${REMOTE_SERVER}:$DIRECTORY"; then "$DIRECTORY" "root@${REMOTE_SERVER}:$DIRECTORY"; then
echo "✅ Rsync completed successfully" success "Rsync complete"
break break
else else
echo "❌ Rsync failed" warn "Rsync failed"
if [ "$attempt" -lt "$RETRY_COUNT" ]; then [[ $i -lt $RETRY_COUNT ]] && sleep "$SLEEP"
echo "Retrying in $SLEEP seconds..."
sleep "$SLEEP"
else
echo "💥 All retries failed"
start_containers
exit 1
fi
fi fi
done done
echo "" echo "$ICON_SYNC Restarting containers..."
echo "🔄 Restarting containers..."
start_containers start_containers
echo "" END=$(date +%s)
echo "🎉 Sync complete!" DURATION=$((END - START))
print_summary "SUCCESS"
} }
main main
common.sh
+56 -89
View File
@@ -3,17 +3,32 @@
# ----------------- UNRAID OPS COMMON LIBRARY (CORE FRAMEWORK v1) ------------------------------- # ----------------- UNRAID OPS COMMON LIBRARY (CORE FRAMEWORK v1) -------------------------------
# ----------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------
# ----------------------------- ICON LAYER -----------------------------
ICON_INFO="ℹ️"
ICON_WARN="⚠️"
ICON_ERROR="❌"
ICON_SUCCESS="✅"
ICON_RUN="🚀"
ICON_STOP="🛑"
ICON_RETRY="🔁"
ICON_SYNC="🔄"
ICON_GEAR="⚙️"
# ----------------------------- Output Helpers ----------------------------- # ----------------------------- Output Helpers -----------------------------
info() { info() {
echo "[INFO] $*" echo "$ICON_INFO [INFO] $*"
} }
warn() { warn() {
echo "[WARN] $*" echo "$ICON_WARN [WARN] $*"
} }
error() { error() {
echo "[ERROR] $*" echo "$ICON_ERROR [ERROR] $*"
}
success() {
echo "$ICON_SUCCESS [OK] $*"
} }
log() { log() {
@@ -38,7 +53,7 @@ parse_args() {
elif [[ "$VAR_VALUE" == "false" ]]; then elif [[ "$VAR_VALUE" == "false" ]]; then
ENABLE_LOGGING=false ENABLE_LOGGING=false
else else
warn "Invalid value for LOG: $VAR_VALUE (use true/false)" warn "Invalid LOG value: $VAR_VALUE"
fi fi
;; ;;
*) *)
@@ -46,7 +61,7 @@ parse_args() {
printf -v "$VAR_NAME" '%s' "$VAR_VALUE" printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
log "Overriding $VAR_NAME -> $VAR_VALUE" log "Overriding $VAR_NAME -> $VAR_VALUE"
else else
warn "Unknown variable $VAR_NAME, ignoring." warn "Unknown variable $VAR_NAME"
fi fi
;; ;;
esac esac
@@ -55,11 +70,11 @@ parse_args() {
case "$ARG" in case "$ARG" in
--dry-run|-n) --dry-run|-n)
DRY_RUN=true DRY_RUN=true
info "Dry-run mode enabled" info "Dry-run enabled"
;; ;;
--log) --log)
ENABLE_LOGGING=true ENABLE_LOGGING=true
info "Verbose logging enabled" info "Logging enabled"
;; ;;
--no-log) --no-log)
ENABLE_LOGGING=false ENABLE_LOGGING=false
@@ -68,11 +83,11 @@ parse_args() {
SHOW_STATUS=true SHOW_STATUS=true
;; ;;
--help|-h) --help|-h)
echo "Usage: script <dir> [--dry-run|-n] [--log] [LOG=true] [VAR=value ...]" echo "Usage: script <dir> [--dry-run|-n] [--log] [VAR=value ...]"
exit 0 exit 0
;; ;;
*) *)
warn "Unknown argument $ARG" warn "Unknown argument: $ARG"
;; ;;
esac esac
fi fi
@@ -82,23 +97,17 @@ parse_args() {
# ----------------------------- Validation ----------------------------- # ----------------------------- Validation -----------------------------
require_var() { require_var() {
local var="$1" local var="$1"
if [[ -z "${!var:-}" ]]; then [[ -z "${!var:-}" ]] && error "Missing required variable: $var" && exit 1
error "Required variable $var is not set."
exit 1
fi
} }
validate_int() { validate_int() {
local name="$1" local name="$1"
local value="$2" local value="$2"
if ! [[ "${value:-}" =~ ^[0-9]+$ ]]; then [[ ! "${value:-}" =~ ^[0-9]+$ ]] && error "$name must be integer" && exit 1
error "$name must be a non-negative integer."
exit 1
fi
} }
# ----------------------------- Host Detection ----------------------------- # ----------------------------- HOST DETECTION -----------------------------
detect_hosts() { detect_hosts() {
LOCAL_HOSTNAME="$(hostname)" LOCAL_HOSTNAME="$(hostname)"
@@ -109,127 +118,85 @@ detect_hosts() {
LOCAL_SERVER_NAME="$HOST2" LOCAL_SERVER_NAME="$HOST2"
REMOTE_SERVER_NAME="$HOST1" REMOTE_SERVER_NAME="$HOST1"
else else
error "Local hostname ($LOCAL_HOSTNAME) not recognized." error "Unknown host: $LOCAL_HOSTNAME"
exit 1
fi fi
declare -A SSH_KEYS declare -A SSH_KEYS
SSH_KEYS["$HOST1|$HOST2"]="$HOST1_SSH_KEY" SSH_KEYS["$HOST1|$HOST2"]="$HOST1_SSH_KEY"
SSH_KEYS["$HOST2|$HOST1"]="$HOST2_SSH_KEY" SSH_KEYS["$HOST2|$HOST1"]="$HOST2_SSH_KEY"
KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME" SSH_KEY="${SSH_KEYS[$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME]}"
SSH_KEY="${SSH_KEYS[$KEY_ID]}"
if [[ -z "$SSH_KEY" ]]; then [[ -z "$SSH_KEY" ]] && error "Missing SSH key mapping"
error "No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME" info "Host: $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
exit 1
fi
info "Local: $LOCAL_SERVER_NAME → Remote: $REMOTE_SERVER_NAME"
log "SSH key: $SSH_KEY"
} }
# ----------------------------- Remote IP ----------------------------- # ----------------------------- REMOTE -----------------------------
resolve_remote_ip() { resolve_remote_ip() {
log "Resolving Tailscale IP for $REMOTE_SERVER_NAME..." log "Resolving remote IP..."
REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null) REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
if [[ -z "$REMOTE_SERVER" ]]; then [[ -z "$REMOTE_SERVER" ]] && error "Failed to resolve remote IP"
error "Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"
exit 1
fi
info "Remote IP: $REMOTE_SERVER" info "Remote IP: $REMOTE_SERVER"
} }
# ----------------------------- Connectivity -----------------------------
check_remote_online() { check_remote_online() {
log "Pinging $REMOTE_SERVER..."
ping -c 1 "$REMOTE_SERVER" &>/dev/null ping -c 1 "$REMOTE_SERVER" &>/dev/null
} }
# ----------------------------- Containers ----------------------------- # ----------------------------- CONTAINERS -----------------------------
declare -a RUNNING_CONTAINERS=() declare -a RUNNING_CONTAINERS=()
stop_containers() { stop_containers() {
if [[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]]; then [[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]] && return
log "No containers defined to stop"
return
fi
info "Stopping containers on $REMOTE_SERVER_NAME..." info "Stopping containers..."
RUNNING_CONTAINERS=() RUNNING_CONTAINERS=()
for container in "${CRITICAL_CONTAINER_NAMES[@]}"; do for c in "${CRITICAL_CONTAINER_NAMES[@]}"; do
log "Checking container: $container"
STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \ STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \
"docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false") "docker inspect -f '{{.State.Running}}' $c 2>/dev/null" || echo "false")
if [[ "$STATUS" == "true" ]]; then if [[ "$STATUS" == "true" ]]; then
info "Stopping $container" warn "Stopping $c"
RUNNING_CONTAINERS+=("$container") RUNNING_CONTAINERS+=("$c")
ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $container" ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $c"
else
log "$container already stopped"
fi fi
done done
} }
start_containers() { start_containers() {
if [[ ${#RUNNING_CONTAINERS[@]} -eq 0 ]]; then [[ ${#RUNNING_CONTAINERS[@]} -eq 0 ]] && return
log "No containers to restart"
return
fi
info "Starting containers on $REMOTE_SERVER_NAME..." info "Starting containers..."
for container in "${RUNNING_CONTAINERS[@]}"; do for c in "${RUNNING_CONTAINERS[@]}"; do
if [[ " ${DELAYED_CONTAINERS[*]} " == *" $container "* ]]; then info "Starting $c"
info "Delaying $container (${CONTAINER_DELAY}s)" ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $c"
sleep "$CONTAINER_DELAY"
fi
info "Starting $container"
ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $container"
done done
} }
# ----------------------------- Rsync Options ----------------------------- # ----------------------------- RSYNC -----------------------------
get_rsync_opts() { get_rsync_opts() {
if [[ -n "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]:-}" ]]; then if [[ -n "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]:-}" ]]; then
read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}" read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}"
log "Using profile rsync options: ${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}" log "Profile rsync opts loaded"
else else
RSYNC_OPTS=("${DEFAULT_RSYNC_OPTS[@]}") RSYNC_OPTS=("${DEFAULT_RSYNC_OPTS[@]}")
log "Using default rsync options: ${DEFAULT_RSYNC_OPTS[*]}" log "Default rsync opts loaded"
fi fi
} }
# ----------------------------- Status Output ----------------------------- # ----------------------------- STATUS -----------------------------
show_status() { show_status() {
echo "===== RSYNC STATUS =====" echo
echo "================= STATUS ================="
echo "Local: $LOCAL_SERVER_NAME" echo "Local: $LOCAL_SERVER_NAME"
echo "Remote: $REMOTE_SERVER_NAME" echo "Remote: $REMOTE_SERVER_NAME"
echo "Remote IP: $REMOTE_SERVER" echo "IP: $REMOTE_SERVER"
echo "SSH Key: $SSH_KEY"
echo
echo "Directory: $DIRECTORY"
echo "Profile: $PROFILE_NAME" echo "Profile: $PROFILE_NAME"
echo
echo "Max Procs: $MAX_RSYNC_PROCS"
echo "Bandwidth: $BW_LIMIT KB/s"
echo "Retries: $RETRY_COUNT"
echo "Sleep: $SLEEP"
echo "Dry Run: $DRY_RUN" echo "Dry Run: $DRY_RUN"
echo echo "Logging: $ENABLE_LOGGING"
echo "Containers:${CRITICAL_CONTAINER_NAMES[*]:-(none)}" echo "Containers:${CRITICAL_CONTAINER_NAMES[*]:-(none)}"
echo "Delayed: ${DELAYED_CONTAINERS[*]:-(none)}" echo "========================================="
echo
echo "Excludes: ${EXCLUDE_DIRS[*]:-(none)}"
echo
echo "Rsync Opts:"
printf ' %s\n' "${RSYNC_OPTS[@]}"
echo "========================="
} }