a3afb2aeae
Model A prototype (run start.sh AS the manager, escalate only via helpers): - check_root.sh: accept the manager user, not root-only (init.sh keeps its own install-time root check). - init.sh: guard the top-level root-check + installer entrypoint with BASH_SOURCE!=$0 so it runs ONLY when init.sh is executed directly; when start.sh sources it as the manager the entrypoint (and its root check) no longer fires. Also: convert bare daemon-touching 'docker' calls (no helper -> hit the nonexistent /var/run socket in rootless) to runFileOp docker across app_status, app_health_*, network_prune, ip_is_available, check_docker_network, backup_db (db dumps) and crontab_check_processor. cd&&compose rooted-branches and 'docker compose --version' checks left as-is (rooted-only / no daemon). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> Signed-off-by: librelad <librelad@digitalangels.vip>
24 lines
860 B
Bash
Executable File
24 lines
860 B
Bash
Executable File
#!/bin/bash
|
|
|
|
# Check if IP is available
|
|
ipIsAvailable()
|
|
{
|
|
local test_ip="$1"
|
|
|
|
# Validate IP format using regex (same pattern as scanning function)
|
|
if [[ ! "$test_ip" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
|
|
ip_available=""
|
|
elif [[ -z "$test_ip" ]]; then
|
|
ip_available=""
|
|
else
|
|
local existing=$(sqlite3 "$docker_dir/$db_file" "SELECT resource_value FROM network_resources WHERE resource_type = 'ip' AND resource_value = '$test_ip' AND status = 'active';" 2>/dev/null)
|
|
if [[ -n "$existing" ]]; then
|
|
ip_available=""
|
|
elif runFileOp docker network inspect $CFG_NETWORK_NAME --format '{{range .Containers}}{{.IPv4Address}} {{end}}' 2>/dev/null | grep -q "$test_ip"; then
|
|
ip_available=""
|
|
else
|
|
ip_available="$test_ip"
|
|
fi
|
|
fi
|
|
}
|