tt
This commit is contained in:
CanbiZ
parent
694de8a758
commit
d4f43113f6
@ -1,67 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func)
|
||||
# Copyright (c) 2021-2025 tteck
|
||||
# Author: tteck (tteckster) | Co-Author: remz1337
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/FlareSolverr/FlareSolverr
|
||||
|
||||
APP="FlareSolverr"
|
||||
var_tags="${var_tags:-proxy}"
|
||||
var_cpu="${var_cpu:-2}"
|
||||
var_ram="${var_ram:-2048}"
|
||||
var_disk="${var_disk:-4}"
|
||||
var_os="${var_os:-debian}"
|
||||
var_version="${var_version:-12}"
|
||||
var_unprivileged="${var_unprivileged:-1}"
|
||||
|
||||
header_info "$APP"
|
||||
variables
|
||||
color
|
||||
catch_errors
|
||||
|
||||
function update_script() {
|
||||
header_info
|
||||
check_container_storage
|
||||
check_container_resources
|
||||
|
||||
if [[ ! -f /etc/systemd/system/flaresolverr.service ]]; then
|
||||
msg_error "No ${APP} Installation Found!"
|
||||
exit
|
||||
fi
|
||||
|
||||
if check_for_gh_release "flaresolverr" "FlareSolverr/FlareSolverr"; then
|
||||
|
||||
msg_info "Stopping service"
|
||||
systemctl stop flaresolverr
|
||||
msg_ok "Stopped service"
|
||||
|
||||
PYTHON_VERSION="3.13" setup_uv
|
||||
|
||||
msg_info "prepare uv python 3.13"
|
||||
UV_PY="$(uv python find 3.13)"
|
||||
cat <<'EOF' >/usr/local/bin/python3
|
||||
#!/bin/bash
|
||||
exec "$UV_PY/bin/python3.13" "$@"
|
||||
EOF
|
||||
chmod +x /usr/local/bin/python3
|
||||
ln -sf "$UV_PY/bin/python3.13" /usr/local/bin/python3.13
|
||||
msg_ok "prepared python 3.13"
|
||||
|
||||
rm -rf /opt/flaresolverr
|
||||
fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
|
||||
|
||||
msg_info "Starting service"
|
||||
systemctl start flaresolverr
|
||||
msg_ok "Started service"
|
||||
fi
|
||||
exit 0
|
||||
}
|
||||
|
||||
start
|
||||
build_container
|
||||
description
|
||||
|
||||
msg_ok "Completed Successfully!\n"
|
||||
echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
|
||||
echo -e "${INFO}${YW} Access it using the following URL:${CL}"
|
||||
echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:8191${CL}"
|
||||
@ -1,71 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright (c) 2021-2025 tteck
|
||||
# Author: tteck (tteckster)
|
||||
# Co-Author: remz1337
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/FlareSolverr/FlareSolverr
|
||||
|
||||
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
||||
color
|
||||
verb_ip6
|
||||
catch_errors
|
||||
setting_up_container
|
||||
network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt-get install -y \
|
||||
apt-transport-https \
|
||||
xvfb
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
PYTHON_VERSION="3.13" setup_uv
|
||||
|
||||
msg_info "prepare uv python 3.13"
|
||||
UV_PY="$(uv python find 3.13)"
|
||||
cat <<'EOF' >/usr/local/bin/python3
|
||||
#!/bin/bash
|
||||
exec "$UV_PY/bin/python3.13" "$@"
|
||||
EOF
|
||||
chmod +x /usr/local/bin/python3
|
||||
ln -sf "$UV_PY/bin/python3.13" /usr/local/bin/python3.13
|
||||
msg_ok "prepared python 3.13"
|
||||
|
||||
msg_info "Installing Chrome"
|
||||
curl -fsSL "https://dl.google.com/linux/linux_signing_key.pub" | gpg --dearmor -o /usr/share/keyrings/google-chrome.gpg
|
||||
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main" >/etc/apt/sources.list.d/google-chrome.list
|
||||
$STD apt update
|
||||
$STD apt install -y google-chrome-stable
|
||||
msg_ok "Installed Chrome"
|
||||
|
||||
fetch_and_deploy_gh_release "flaresolverr" "FlareSolverr/FlareSolverr" "prebuild" "latest" "/opt/flaresolverr" "flaresolverr_linux_x64.tar.gz"
|
||||
|
||||
msg_info "Creating Service"
|
||||
cat <<EOF >/etc/systemd/system/flaresolverr.service
|
||||
[Unit]
|
||||
Description=FlareSolverr
|
||||
After=network.target
|
||||
[Service]
|
||||
SyslogIdentifier=flaresolverr
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
Type=simple
|
||||
Environment="LOG_LEVEL=info"
|
||||
Environment="CAPTCHA_SOLVER=none"
|
||||
WorkingDirectory=/opt/flaresolverr
|
||||
ExecStart=/opt/flaresolverr/flaresolverr
|
||||
TimeoutStopSec=30
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
systemctl enable -q --now flaresolverr
|
||||
msg_ok "Created Service"
|
||||
|
||||
motd_ssh
|
||||
customize
|
||||
|
||||
msg_info "Cleaning up"
|
||||
$STD apt-get -y autoremove
|
||||
$STD apt-get -y autoclean
|
||||
msg_ok "Cleaned"
|
||||
187
tools/pve/prx-add-ips.sh
Normal file
187
tools/pve/prx-add-ips.sh
Normal file
@ -0,0 +1,187 @@
|
||||
#!/usr/bin/env bash
|
||||
# -----------------------------------------------------------------
|
||||
# Proxmox Add-IPs (LXC + VMs → Tags)
|
||||
# -----------------------------------------------------------------
|
||||
# © 2021-2025 community-scripts ORG
|
||||
# Author: MickLesk (CanbiZ)
|
||||
# License: MIT
|
||||
# -----------------------------------------------------------------
|
||||
|
||||
APP="Proxmox Add-IPs"
|
||||
FILE_PATH="/usr/local/bin/prx-add-ips"
|
||||
CONF_DIR="/opt/prx-add-ips"
|
||||
CONF_FILE="$CONF_DIR/prx-add-ips.conf"
|
||||
|
||||
set -Eeuo pipefail
|
||||
|
||||
# --- Farben (optional) ---
|
||||
YW="\033[33m"
|
||||
GN="\033[1;92m"
|
||||
RD="\033[01;31m"
|
||||
CL="\033[m"
|
||||
msg() { [[ "${USE_COLOR:-true}" == "true" ]] && echo -e "$@" || echo -e "$(echo "$@" | sed -E 's/\x1B\[[0-9;]*[JKmsu]//g')"; }
|
||||
msg_info() { msg "${YW}➜ $1${CL}"; }
|
||||
msg_ok() { msg "${GN}✔ $1${CL}"; }
|
||||
msg_error() { msg "${RD}✖ $1${CL}"; }
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# Installation
|
||||
# -----------------------------------------------------------------
|
||||
if [[ -f "$FILE_PATH" ]]; then
|
||||
msg_info "$APP already installed at $FILE_PATH"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
msg_info "Installing dependencies"
|
||||
apt-get update -qq
|
||||
apt-get install -y jq ipcalc net-tools >/dev/null
|
||||
msg_ok "Dependencies installed"
|
||||
|
||||
mkdir -p "$CONF_DIR"
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# Config
|
||||
# -----------------------------------------------------------------
|
||||
if [[ ! -f "$CONF_FILE" ]]; then
|
||||
cat <<EOF >"$CONF_FILE"
|
||||
# prx-add-ips.conf – configuration for Proxmox Add-IPs
|
||||
|
||||
# Allowed CIDRs
|
||||
CIDR_LIST=(
|
||||
192.168.0.0/16
|
||||
10.0.0.0/8
|
||||
172.16.0.0/12
|
||||
)
|
||||
|
||||
# Main loop interval in seconds
|
||||
LOOP_INTERVAL=60
|
||||
|
||||
# Use colored output? (true/false)
|
||||
USE_COLOR=true
|
||||
EOF
|
||||
msg_ok "Default config written to $CONF_FILE"
|
||||
else
|
||||
msg_info "Config $CONF_FILE already exists"
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# Main Script
|
||||
# -----------------------------------------------------------------
|
||||
cat <<"EOF" >"$FILE_PATH"
|
||||
#!/usr/bin/env bash
|
||||
set -Eeuo pipefail
|
||||
|
||||
CONFIG_FILE="/opt/prx-add-ips/prx-add-ips.conf"
|
||||
[[ -f "$CONFIG_FILE" ]] && source "$CONFIG_FILE"
|
||||
|
||||
YW="\033[33m"; GN="\033[1;92m"; RD="\033[01;31m"; CL="\033[m"
|
||||
msg() { [[ "${USE_COLOR:-true}" == "true" ]] && echo -e "$@" || echo -e "$(echo "$@" | sed -E 's/\x1B\[[0-9;]*[JKmsu]//g')"; }
|
||||
msg_info() { msg "${YW}➜ $1${CL}"; }
|
||||
msg_ok() { msg "${GN}✔ $1${CL}"; }
|
||||
msg_error(){ msg "${RD}✖ $1${CL}"; }
|
||||
|
||||
is_valid_ipv4() {
|
||||
local ip=$1
|
||||
[[ $ip =~ ^([0-9]{1,3}\.){3}[0-9]{1,3}$ ]] || return 1
|
||||
for part in ${ip//./ }; do
|
||||
((part >= 0 && part <= 255)) || return 1
|
||||
done
|
||||
return 0
|
||||
}
|
||||
|
||||
ip_in_cidrs() {
|
||||
local ip="$1"
|
||||
for cidr in "${CIDR_LIST[@]}"; do
|
||||
ipcalc -nb "$cidr" "$ip" &>/dev/null && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
set_tags() {
|
||||
local vmid="$1" kind="$2"; shift 2
|
||||
local ips=("$@")
|
||||
|
||||
# aktuelle Tags holen
|
||||
local existing_tags=()
|
||||
mapfile -t existing_tags < <($kind config "$vmid" | awk '/tags:/{$1=""; print}' | tr ';' '\n')
|
||||
|
||||
local existing_ips=()
|
||||
local non_ip_tags=()
|
||||
for t in "${existing_tags[@]}"; do
|
||||
if is_valid_ipv4 "$t"; then
|
||||
existing_ips+=("$t")
|
||||
else
|
||||
non_ip_tags+=("$t")
|
||||
fi
|
||||
done
|
||||
|
||||
local new_tags=("${non_ip_tags[@]}" "${ips[@]}")
|
||||
new_tags=($(printf "%s\n" "${new_tags[@]}" | sort -u))
|
||||
|
||||
if [[ "$(printf "%s\n" "${existing_ips[@]}" | sort -u)" != "$(printf "%s\n" "${ips[@]}" | sort -u)" ]]; then
|
||||
msg_info "$kind $vmid → updating tags to ${new_tags[*]}"
|
||||
$kind set "$vmid" -tags "$(IFS=';'; echo "${new_tags[*]}")"
|
||||
else
|
||||
msg_info "$kind $vmid → no IP change"
|
||||
fi
|
||||
}
|
||||
|
||||
update_lxc_iptags() {
|
||||
for vmid in $(pct list | awk 'NR>1 {print $1}'); do
|
||||
local ips=()
|
||||
for ip in $(lxc-info -n "$vmid" -iH 2>/dev/null); do
|
||||
is_valid_ipv4 "$ip" && ip_in_cidrs "$ip" && ips+=("$ip")
|
||||
done
|
||||
[[ ${#ips[@]} -gt 0 ]] && set_tags "$vmid" pct "${ips[@]}"
|
||||
done
|
||||
}
|
||||
|
||||
update_vm_iptags() {
|
||||
for vmid in $(qm list | awk 'NR>1 {print $1}'); do
|
||||
if qm agent "$vmid" ping &>/dev/null; then
|
||||
local ips=()
|
||||
mapfile -t ips < <(qm agent "$vmid" network-get-interfaces \
|
||||
| jq -r '.[]?."ip-addresses"[]?."ip-address" | select(test("^[0-9]+\\."))')
|
||||
local filtered=()
|
||||
for ip in "${ips[@]}"; do
|
||||
is_valid_ipv4 "$ip" && ip_in_cidrs "$ip" && filtered+=("$ip")
|
||||
done
|
||||
[[ ${#filtered[@]} -gt 0 ]] && set_tags "$vmid" qm "${filtered[@]}"
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
while true; do
|
||||
update_lxc_iptags
|
||||
update_vm_iptags
|
||||
sleep "${LOOP_INTERVAL:-60}"
|
||||
done
|
||||
EOF
|
||||
|
||||
chmod +x "$FILE_PATH"
|
||||
msg_ok "Main script installed to $FILE_PATH"
|
||||
|
||||
# -----------------------------------------------------------------
|
||||
# Systemd Service
|
||||
# -----------------------------------------------------------------
|
||||
SERVICE="/etc/systemd/system/prx-add-ips.service"
|
||||
if [[ ! -f "$SERVICE" ]]; then
|
||||
cat <<EOF >"$SERVICE"
|
||||
[Unit]
|
||||
Description=Proxmox Add-IPs (LXC + VM)
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=$FILE_PATH
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
msg_ok "Service created"
|
||||
fi
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl enable -q --now prx-add-ips.service
|
||||
msg_ok "$APP service started"
|
||||
Loading…
x
Reference in New Issue
Block a user