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

test

Browse Source
This commit is contained in:
FailedProxy
2026-03-27 18:27:04 +00:00
parent e2e628c000
commit fb6c76eb92
2 changed files with 61 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rsync/rsync.sh
+9 -67
View File
@@ -23,81 +23,53 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "$SCRIPT_DIR/../Master.conf" source "$SCRIPT_DIR/../Master.conf"
source "$SCRIPT_DIR/../common.sh" source "$SCRIPT_DIR/../common.sh"
# ---------------------------------------------------------------------------------- # ----------------------------- INPUT -----------------------------
# INPUT PARSING (FIXED)
# ----------------------------------------------------------------------------------
DIRECTORY="" DIRECTORY=""
RAW_ARGS=() RAW_ARGS=()
for ARG in "$@"; do for ARG in "$@"; do
case "$ARG" in case "$ARG" in
--*|*=*) --*|*=*) RAW_ARGS+=("$ARG") ;;
RAW_ARGS+=("$ARG")
;;
*) *)
if [[ -z "$DIRECTORY" ]]; then if [[ -z "$DIRECTORY" ]]; then
DIRECTORY="$ARG" DIRECTORY="$ARG"
else else
RAW_ARGS+=("$ARG") RAW_ARGS+=("$ARG")
fi fi
;; ;;
esac esac
done done
parse_args "${RAW_ARGS[@]}" parse_args "${RAW_ARGS[@]}"
if [[ -z "$DIRECTORY" ]]; then [[ -z "$DIRECTORY" ]] && error "Missing directory" && exit 1
error "Missing directory"
exit 1
fi
# ---------------------------------------------------------------------------------- # ----------------------------- CORE -----------------------------
# HOST SETUP
# ----------------------------------------------------------------------------------
detect_hosts detect_hosts
resolve_remote_ip resolve_remote_ip
# ----------------------------------------------------------------------------------
# PROFILE SETUP
# ----------------------------------------------------------------------------------
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}
BW_LIMIT=${PROFILE_BW_LIMIT[$PROFILE_NAME]:-$BW_LIMIT}
CRITICAL_CONTAINER_NAMES=(${PROFILE_CRITICAL_CONTAINER_NAMES[$PROFILE_NAME]})
DELAYED_CONTAINERS=(${PROFILE_DELAYED_CONTAINERS[$PROFILE_NAME]})
CONTAINER_DELAY=${PROFILE_CONTAINER_DELAY[$PROFILE_NAME]:-$CONTAINER_DELAY}
RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT} 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 -----------------------------
# STATUS MODE
# ----------------------------------------------------------------------------------
if [[ "${SHOW_STATUS:-false}" == true ]]; then if [[ "${SHOW_STATUS:-false}" == true ]]; then
show_status show_status
exit 0 exit 0
fi fi
# ---------------------------------------------------------------------------------- # ----------------------------- FLOW -----------------------------
# HEADER (HANDLED IN COMMON OUTPUT LAYER)
# ----------------------------------------------------------------------------------
echo
info "Sync Starting" info "Sync Starting"
info "Source: $DIRECTORY" info "Source: $DIRECTORY"
info "Remote: $REMOTE_SERVER:$DIRECTORY" info "Remote: $REMOTE_SERVER:$DIRECTORY"
info "Profile: $PROFILE_NAME" info "Profile: $PROFILE_NAME"
info "Dry Run: $DRY_RUN"
echo "--------------------------------------------"
# ----------------------------------------------------------------------------------
# REMOTE CHECK
# ----------------------------------------------------------------------------------
info "Checking remote..." info "Checking remote..."
@@ -109,45 +81,21 @@ for i in $(seq 1 "$RETRY_COUNT"); do
REMOTE_OK=true REMOTE_OK=true
break break
fi fi
warn "Retry $i/$RETRY_COUNT" warn "Retry $i/$RETRY_COUNT"
sleep "$SLEEP" sleep "$SLEEP"
done done
if [[ "$REMOTE_OK" != true ]]; then [[ "$REMOTE_OK" != true ]] && error "Remote unreachable" && exit 1
error "Remote unreachable"
exit 1
fi
# ----------------------------------------------------------------------------------
# RSYNC LIMITER
# ----------------------------------------------------------------------------------
wait_for_rsync wait_for_rsync
# ----------------------------------------------------------------------------------
# CONTAINERS
# ----------------------------------------------------------------------------------
stop_containers stop_containers
# ----------------------------------------------------------------------------------
# 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
if [[ "$DRY_RUN" == true ]]; then [[ "$DRY_RUN" == true ]] && RSYNC_OPTS+=("--dry-run")
RSYNC_OPTS+=("--dry-run")
fi
# ----------------------------------------------------------------------------------
# RSYNC EXECUTION (NO LOGGING HERE)
# ----------------------------------------------------------------------------------
RSYNC_CMD=( RSYNC_CMD=(
rsync rsync
@@ -173,13 +121,7 @@ start_containers
END=$(date +%s) END=$(date +%s)
# ----------------------------------------------------------------------------------
# SUMMARY (HANDLED VIA COMMON OUTPUT LAYER ONLY)
# ----------------------------------------------------------------------------------
echo
info "Directory: $DIRECTORY" info "Directory: $DIRECTORY"
info "Profile: $PROFILE_NAME" info "Profile: $PROFILE_NAME"
info "Duration: $((END-START))s" info "Duration: $((END-START))s"
info "Status: DONE" info "Status: DONE"
echo "==================="
common.sh
+51 -36
View File
@@ -1,9 +1,8 @@
#!/bin/bash #!/bin/bash
# ----------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------
# ----------------- UNRAID OPS COMMON LIBRARY (CORE FRAMEWORK v1) ------------------------------- # ----------------- UNRAID OPS COMMON LIBRARY (CORE FRAMEWORK v1 FIXED) -------------------------
# ----------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------
# ----------------------------- ICON LAYER -----------------------------
ICON_INFO="ℹ️" ICON_INFO="ℹ️"
ICON_WARN="⚠️" ICON_WARN="⚠️"
ICON_ERROR="❌" ICON_ERROR="❌"
@@ -14,7 +13,8 @@ ICON_RETRY="🔁"
ICON_SYNC="🔄" ICON_SYNC="🔄"
ICON_GEAR="⚙️" ICON_GEAR="⚙️"
# ----------------------------- Output Helpers ----------------------------- # ----------------------------- Output -----------------------------
info() { echo "$ICON_INFO [INFO] $*"; } info() { echo "$ICON_INFO [INFO] $*"; }
warn() { echo "$ICON_WARN [WARN] $*"; } warn() { echo "$ICON_WARN [WARN] $*"; }
error() { echo "$ICON_ERROR [ERROR] $*"; } error() { echo "$ICON_ERROR [ERROR] $*"; }
@@ -24,54 +24,45 @@ log() {
[[ "${ENABLE_LOGGING:-false}" == true ]] && echo "[LOG] $*" [[ "${ENABLE_LOGGING:-false}" == true ]] && echo "[LOG] $*"
} }
# ----------------------------- Argument Parsing ----------------------------- # ----------------------------- Args -----------------------------
parse_args() { parse_args() {
ENABLE_LOGGING=${ENABLE_LOGGING:-false} ENABLE_LOGGING=${ENABLE_LOGGING:-false}
DRY_RUN=${DRY_RUN:-false} DRY_RUN=${DRY_RUN:-false}
SHOW_STATUS=${SHOW_STATUS:-false}
local CLEAN_ARGS=() CLEAN_ARGS=()
for ARG in "$@"; do for ARG in "$@"; do
if [[ "$ARG" == *=* ]]; then if [[ "$ARG" == *=* ]]; then
VAR_NAME="${ARG%%=*}" VAR="${ARG%%=*}"
VAR_VALUE="${ARG#*=}" VAL="${ARG#*=}"
case "$VAR_NAME" in case "$VAR" in
LOG) LOG)
[[ "$VAR_VALUE" == "true" ]] && ENABLE_LOGGING=true [[ "$VAL" == "true" ]] && ENABLE_LOGGING=true
[[ "$VAR_VALUE" == "false" ]] && ENABLE_LOGGING=false [[ "$VAL" == "false" ]] && ENABLE_LOGGING=false
;; ;;
*) *)
if declare -p "$VAR_NAME" &>/dev/null; then if declare -p "$VAR" &>/dev/null; then
printf -v "$VAR_NAME" '%s' "$VAR_VALUE" printf -v "$VAR" '%s' "$VAL"
log "Set $VAR_NAME=$VAR_VALUE" log "Set $VAR=$VAL"
else else
warn "Unknown variable: $VAR_NAME" warn "Unknown variable: $VAR"
fi fi
;; ;;
esac esac
else else
case "$ARG" in case "$ARG" in
--dry-run|-n) --dry-run|-n) DRY_RUN=true ;;
DRY_RUN=true --log) ENABLE_LOGGING=true ;;
;; --no-log) ENABLE_LOGGING=false ;;
--log) --status|--summary) SHOW_STATUS=true ;;
ENABLE_LOGGING=true
;;
--no-log)
ENABLE_LOGGING=false
;;
--status|--summary)
SHOW_STATUS=true
;;
--help|-h) --help|-h)
echo "Usage: script <dir> [--dry-run] [--log] [VAR=value]" echo "Usage: script <dir> [--dry-run] [--log]"
exit 0 exit 0
;; ;;
*) *) CLEAN_ARGS+=("$ARG") ;;
CLEAN_ARGS+=("$ARG")
;;
esac esac
fi fi
done done
@@ -80,15 +71,13 @@ parse_args() {
} }
# ----------------------------- Validation ----------------------------- # ----------------------------- Validation -----------------------------
require_var() { require_var() {
[[ -z "${!1:-}" ]] && error "Missing required: $1" && exit 1 [[ -z "${!1:-}" ]] && error "Missing required: $1" && exit 1
} }
validate_int() {
[[ ! "${2:-}" =~ ^[0-9]+$ ]] && error "$1 must be integer" && exit 1
}
# ----------------------------- Host Detection ----------------------------- # ----------------------------- Host Detection -----------------------------
detect_hosts() { detect_hosts() {
LOCAL_HOSTNAME="$(hostname)" LOCAL_HOSTNAME="$(hostname)"
@@ -115,6 +104,7 @@ detect_hosts() {
} }
# ----------------------------- Remote ----------------------------- # ----------------------------- Remote -----------------------------
resolve_remote_ip() { resolve_remote_ip() {
log "Resolving remote IP..." 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)
@@ -125,7 +115,8 @@ resolve_remote_ip() {
} }
# ----------------------------- Containers ----------------------------- # ----------------------------- Containers -----------------------------
declare -a RUNNING_CONTAINERS=()
RUNNING_CONTAINERS=()
stop_containers() { stop_containers() {
[[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]] && return [[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]] && return
@@ -156,7 +147,30 @@ start_containers() {
done done
} }
# ----------------------------- RSYNC LIMITER (FIX ADDED) -----------------------------
wait_for_rsync() {
: "${RETRY_COUNT:=5}"
: "${MAX_RSYNC_PROCS:=2}"
: "${SLEEP:=2}"
for i in $(seq 1 "$RETRY_COUNT"); do
COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
if [[ "$COUNT" -ge "$MAX_RSYNC_PROCS" ]]; then
warn "Waiting rsync slot ($COUNT/$MAX_RSYNC_PROCS)"
sleep "$SLEEP"
else
return 0
fi
done
error "Too many rsync processes"
exit 1
}
# ----------------------------- RSYNC OPTIONS ----------------------------- # ----------------------------- RSYNC OPTIONS -----------------------------
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]}"
@@ -166,6 +180,7 @@ get_rsync_opts() {
} }
# ----------------------------- STATUS ----------------------------- # ----------------------------- STATUS -----------------------------
show_status() { show_status() {
echo "===== STATUS =====" echo "===== STATUS ====="
echo "Local: $LOCAL_SERVER_NAME" echo "Local: $LOCAL_SERVER_NAME"