Stable v1 framework
This commit is contained in:
+8
-8
@@ -23,7 +23,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
source "$SCRIPT_DIR/../Master.conf"
|
||||
source "$SCRIPT_DIR/../common.sh"
|
||||
|
||||
# ----------------------------- ARG PARSING FIX -----------------------------
|
||||
# ARG PARSING FIX
|
||||
DIRECTORY=""
|
||||
RAW_ARGS=()
|
||||
|
||||
@@ -42,11 +42,11 @@ parse_args "${RAW_ARGS[@]}"
|
||||
|
||||
[[ -z "$DIRECTORY" ]] && error "Missing directory" && exit 1
|
||||
|
||||
# ----------------------------- HOST -----------------------------
|
||||
# HOST
|
||||
detect_hosts
|
||||
resolve_remote_ip
|
||||
|
||||
# ----------------------------- PROFILE -----------------------------
|
||||
# PROFILE
|
||||
PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
MAX_RSYNC_PROCS=${PROFILE_MAX_PROCS[$PROFILE_NAME]:-$MAX_RSYNC_PROCS}
|
||||
@@ -58,13 +58,13 @@ RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
|
||||
SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
|
||||
EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}})
|
||||
|
||||
# ----------------------------- STATUS -----------------------------
|
||||
# STATUS
|
||||
if [[ "${SHOW_STATUS:-false}" == true ]]; then
|
||||
show_status
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# ----------------------------- HEADER -----------------------------
|
||||
# HEADER
|
||||
echo
|
||||
echo "$ICON_RUN Sync Starting"
|
||||
echo "Source: $DIRECTORY"
|
||||
@@ -72,7 +72,7 @@ echo "Remote: $REMOTE_SERVER:$DIRECTORY"
|
||||
echo "Profile: $PROFILE_NAME"
|
||||
echo "Dry Run: $DRY_RUN"
|
||||
|
||||
# ----------------------------- REMOTE CHECK FIX -----------------------------
|
||||
# REMOTE CHECK FIX
|
||||
echo "$ICON_GEAR Checking remote..."
|
||||
|
||||
REMOTE_OK=false
|
||||
@@ -92,7 +92,7 @@ if [[ "$REMOTE_OK" != true ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ----------------------------- RSYNC LIMIT -----------------------------
|
||||
# RSYNC LIMIT
|
||||
wait_for_rsync() {
|
||||
for i in $(seq 1 "$RETRY_COUNT"); do
|
||||
COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
|
||||
@@ -111,7 +111,7 @@ wait_for_rsync() {
|
||||
|
||||
wait_for_rsync
|
||||
|
||||
# ----------------------------- RUN -----------------------------
|
||||
# RUN
|
||||
stop_containers
|
||||
|
||||
get_rsync_opts
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
#!/bin/bash
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
# ----------------- UNRAID OPS COMMON LIBRARY (FINAL STABLE FRAMEWORK v1) -----------------------
|
||||
# ----------------- UNRAID OPS COMMON LIBRARY (STABLE FRAMEWORK v1) -----------------------
|
||||
# -----------------------------------------------------------------------------------------------
|
||||
|
||||
# ----------------------------- ICONS -----------------------------
|
||||
|
||||
# ICONS Profiles
|
||||
ICON_INFO="ℹ️"
|
||||
ICON_WARN="⚠️"
|
||||
ICON_ERROR="❌"
|
||||
@@ -15,8 +14,7 @@ ICON_RETRY="🔁"
|
||||
ICON_SYNC="🔄"
|
||||
ICON_GEAR="⚙️"
|
||||
|
||||
# ----------------------------- OUTPUT -----------------------------
|
||||
|
||||
# OUTPUT
|
||||
info() { echo "$ICON_INFO [INFO] $*"; }
|
||||
warn() { echo "$ICON_WARN [WARN] $*"; }
|
||||
error() { echo "$ICON_ERROR [ERROR] $*"; }
|
||||
@@ -26,8 +24,7 @@ log() {
|
||||
[[ "${ENABLE_LOGGING:-false}" == true ]] && echo "[LOG] $*"
|
||||
}
|
||||
|
||||
# ----------------------------- ARG PARSER -----------------------------
|
||||
|
||||
# ARG PARSER
|
||||
parse_args() {
|
||||
ENABLE_LOGGING=${ENABLE_LOGGING:-false}
|
||||
DRY_RUN=${DRY_RUN:-false}
|
||||
@@ -72,14 +69,12 @@ parse_args() {
|
||||
PARSED_ARGS=("${CLEAN_ARGS[@]}")
|
||||
}
|
||||
|
||||
# ----------------------------- VALIDATION -----------------------------
|
||||
|
||||
# VALIDATION
|
||||
require_var() {
|
||||
[[ -z "${!1:-}" ]] && error "Missing required: $1" && exit 1
|
||||
}
|
||||
|
||||
# ----------------------------- HOST DETECTION -----------------------------
|
||||
|
||||
# HOST DETECTION
|
||||
detect_hosts() {
|
||||
LOCAL_HOSTNAME="$(hostname)"
|
||||
|
||||
@@ -105,8 +100,7 @@ detect_hosts() {
|
||||
info "Host: $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
|
||||
}
|
||||
|
||||
# ----------------------------- REMOTE -----------------------------
|
||||
|
||||
# REMOTE
|
||||
resolve_remote_ip() {
|
||||
log "Resolving remote IP..."
|
||||
REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
|
||||
@@ -116,8 +110,7 @@ resolve_remote_ip() {
|
||||
info "Remote IP: $REMOTE_SERVER"
|
||||
}
|
||||
|
||||
# ----------------------------- CONTAINERS -----------------------------
|
||||
|
||||
# CONTAINERS
|
||||
RUNNING_CONTAINERS=()
|
||||
|
||||
stop_containers() {
|
||||
@@ -162,8 +155,7 @@ start_containers() {
|
||||
done
|
||||
}
|
||||
|
||||
# ----------------------------- RSYNC LIMITER (FIXED FINAL) -----------------------------
|
||||
|
||||
# RSYNC LIMITER (FIXED FINAL)
|
||||
wait_for_rsync() {
|
||||
: "${RETRY_COUNT:=5}"
|
||||
: "${MAX_RSYNC_PROCS:=2}"
|
||||
@@ -191,8 +183,7 @@ wait_for_rsync() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
# ----------------------------- RSYNC OPTIONS -----------------------------
|
||||
|
||||
# RSYNC OPTIONS
|
||||
get_rsync_opts() {
|
||||
if [[ -n "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]:-}" ]]; then
|
||||
read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}"
|
||||
@@ -201,8 +192,7 @@ get_rsync_opts() {
|
||||
fi
|
||||
}
|
||||
|
||||
# ----------------------------- STATUS -----------------------------
|
||||
|
||||
# STATUS
|
||||
show_status() {
|
||||
echo "===== STATUS ====="
|
||||
echo "Local: $LOCAL_SERVER_NAME"
|
||||
|
||||
Reference in New Issue
Block a user