mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-09-15 09:14:08 +00:00
Compare commits
20 Commits
2026-09-12
...
fix-tor-sn
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab8a3c40d4 | ||
|
|
9cab9ea9e9 | ||
|
|
05dc593f99 | ||
|
|
a7d58ba5c7 | ||
|
|
8a8c636a83 | ||
|
|
7c851f766e | ||
|
|
fbea9c04c3 | ||
|
|
1e500043b7 | ||
|
|
dd421cec72 | ||
|
|
e4d5fcede1 | ||
|
|
91c6673ae0 | ||
|
|
787dbf2420 | ||
|
|
2bac6ac611 | ||
|
|
7a36712ef4 | ||
|
|
f21bd26c8a | ||
|
|
e476e28e33 | ||
|
|
db50b50a63 | ||
|
|
33a110f06a | ||
|
|
70091db00b | ||
|
|
8b02661dd0 |
47
CHANGELOG.md
47
CHANGELOG.md
@@ -543,8 +543,55 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
</details>
|
||||
|
||||
## 2026-09-15
|
||||
|
||||
### 🆕 New Scripts
|
||||
|
||||
- valhalla ([#17231](https://github.com/community-scripts/ProxmoxVE/pull/17231))
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- tracearr: copy packages/emails into the deploy tree [@connorgallopo](https://github.com/connorgallopo) ([#17268](https://github.com/community-scripts/ProxmoxVE/pull/17268))
|
||||
- Immich: Pin to v3.2.1 [@vhsdream](https://github.com/vhsdream) ([#17264](https://github.com/community-scripts/ProxmoxVE/pull/17264))
|
||||
|
||||
### 💾 Core
|
||||
|
||||
- Releases: rank releases on their numbers, not on sort -V over the raw tag [@MickLesk](https://github.com/MickLesk) ([core#39](https://github.com/community-scripts/core/pull/39))
|
||||
|
||||
### 🧰 Tools
|
||||
|
||||
- #### 🔧 Refactor
|
||||
|
||||
- Refactor: monitor-all (decide on flag values, not on key presence) [@MickLesk](https://github.com/MickLesk) ([#17261](https://github.com/community-scripts/ProxmoxVE/pull/17261))
|
||||
|
||||
## 2026-09-14
|
||||
|
||||
### 🆕 New Scripts
|
||||
|
||||
- Borg-UI ([#17258](https://github.com/community-scripts/ProxmoxVE/pull/17258))
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- SparkyFitness: substitute NGINX_RATE_LIMIT in nginx config [@RafBorrelli](https://github.com/RafBorrelli) ([#17256](https://github.com/community-scripts/ProxmoxVE/pull/17256))
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- spliit: bump Node.js from 24 to 26 [@github-actions[bot]](https://github.com/github-actions[bot]) ([#17250](https://github.com/community-scripts/ProxmoxVE/pull/17250))
|
||||
|
||||
## 2026-09-13
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- Downgrade iobroker to Node 24 [@Copilot](https://github.com/Copilot) ([#17229](https://github.com/community-scripts/ProxmoxVE/pull/17229))
|
||||
|
||||
### 💾 Core
|
||||
|
||||
- Pick the highest release version, not the newest published one [@MickLesk](https://github.com/MickLesk) ([core#38](https://github.com/community-scripts/core/pull/38))
|
||||
|
||||
## 2026-09-12
|
||||
|
||||
### 🆕 New Scripts
|
||||
|
||||
121
ct/borg-ui.sh
Normal file
121
ct/borg-ui.sh
Normal file
@@ -0,0 +1,121 @@
|
||||
#!/usr/bin/env bash
|
||||
_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
|
||||
_cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
|
||||
source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: MickLesk (CanbiZ)
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/karanhudia/borg-ui
|
||||
|
||||
APP="Borg-UI"
|
||||
var_tags="${var_tags:-backup}"
|
||||
var_cpu="${var_cpu:-2}"
|
||||
var_ram="${var_ram:-4096}"
|
||||
var_disk="${var_disk:-10}"
|
||||
var_os="${var_os:-debian}"
|
||||
var_version="${var_version:-13}"
|
||||
#var_arm64="${var_arm64:-no}"
|
||||
var_unprivileged="${var_unprivileged:-1}"
|
||||
|
||||
header_info "$APP"
|
||||
variables
|
||||
color
|
||||
catch_errors
|
||||
|
||||
function update_script() {
|
||||
header_info
|
||||
check_container_storage
|
||||
check_container_resources
|
||||
|
||||
if [[ ! -d /opt/borg-ui ]]; then
|
||||
msg_error "No ${APP} Installation Found!"
|
||||
exit
|
||||
fi
|
||||
|
||||
if check_for_gh_release "borg-ui" "karanhudia/borg-ui"; then
|
||||
msg_info "Stopping Service"
|
||||
systemctl stop borg-ui
|
||||
msg_ok "Stopped Service"
|
||||
|
||||
create_backup /opt/borg-ui/.env
|
||||
|
||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "borg-ui" "karanhudia/borg-ui" "tarball"
|
||||
|
||||
restore_backup
|
||||
|
||||
BORG_UI_VERSION=$(cat "$HOME/.borg-ui" 2>/dev/null)
|
||||
if [[ -n "$BORG_UI_VERSION" ]]; then
|
||||
if grep -q '^APP_VERSION=' /opt/borg-ui/.env; then
|
||||
sed -i "s|^APP_VERSION=.*|APP_VERSION=${BORG_UI_VERSION}|" /opt/borg-ui/.env
|
||||
else
|
||||
echo "APP_VERSION=${BORG_UI_VERSION}" >>/opt/borg-ui/.env
|
||||
fi
|
||||
fi
|
||||
|
||||
# Only the three Borg pins appear in every release of this file; PYTHON_VERSION
|
||||
# and RCLONE_VERSION were added upstream after v2.2.6, so both fall back.
|
||||
RUNTIME_ENV="/opt/borg-ui/docker/runtime-base.env"
|
||||
BORG1_VERSION=$(sed -n 's/^BORG1_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORG2_VERSION=$(sed -n 's/^BORG2_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORGSTORE_VERSION=$(sed -n 's/^BORGSTORE_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
RCLONE_VERSION=$(sed -n 's/^RCLONE_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORG_PYTHON=$(sed -n 's/^PYTHON_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORG_PYTHON="${BORG_PYTHON:-3.12}"
|
||||
if [[ -z "$BORG1_VERSION" || -z "$BORG2_VERSION" || -z "$BORGSTORE_VERSION" ]]; then
|
||||
msg_error "Could not read the pinned Borg versions from ${RUNTIME_ENV}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$(cat /opt/borg1-venv/.pinned_version 2>/dev/null)" != "$BORG1_VERSION" ]]; then
|
||||
msg_info "Installing Borg ${BORG1_VERSION} (Patience)"
|
||||
$STD uv venv --python "$BORG_PYTHON" /opt/borg1-venv
|
||||
$STD uv pip install --python /opt/borg1-venv pyfuse3 "borgbackup==${BORG1_VERSION}"
|
||||
echo "$BORG1_VERSION" >/opt/borg1-venv/.pinned_version
|
||||
ln -sf /opt/borg1-venv/bin/borg /usr/local/bin/borg
|
||||
msg_ok "Installed Borg ${BORG1_VERSION}"
|
||||
fi
|
||||
|
||||
if [[ "$(cat /opt/borg2-venv/.pinned_version 2>/dev/null)" != "${BORG2_VERSION}-${BORGSTORE_VERSION}" ]]; then
|
||||
msg_info "Installing Borg ${BORG2_VERSION} (Patience)"
|
||||
$STD uv venv --python "$BORG_PYTHON" /opt/borg2-venv
|
||||
$STD uv pip install --python /opt/borg2-venv pyfuse3 "borgbackup==${BORG2_VERSION}" "borgstore[rclone,sftp,rest,s3,blake3]==${BORGSTORE_VERSION}"
|
||||
echo "${BORG2_VERSION}-${BORGSTORE_VERSION}" >/opt/borg2-venv/.pinned_version
|
||||
ln -sf /opt/borg2-venv/bin/borg /usr/local/bin/borg2
|
||||
msg_ok "Installed Borg ${BORG2_VERSION}"
|
||||
fi
|
||||
|
||||
RCLONE_TAG="${RCLONE_VERSION:+v${RCLONE_VERSION}}"
|
||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "rclone" "rclone/rclone" "prebuild" "${RCLONE_TAG:-latest}" "/opt/rclone" "rclone-${RCLONE_TAG:-*}-linux-$(arch_resolve amd64 arm64).zip"
|
||||
ln -sf /opt/rclone/rclone /usr/local/bin/rclone
|
||||
|
||||
msg_info "Building Frontend"
|
||||
cd /opt/borg-ui/frontend
|
||||
$STD npm ci
|
||||
$STD npm run build
|
||||
rm -rf /opt/borg-ui/app/static
|
||||
mkdir -p /opt/borg-ui/app/static
|
||||
cp -r /opt/borg-ui/frontend/build/* /opt/borg-ui/app/static/
|
||||
msg_ok "Built Frontend"
|
||||
|
||||
msg_info "Updating Python Environment"
|
||||
cd /opt/borg-ui
|
||||
$STD uv venv --python "$BORG_PYTHON" /opt/borg-ui/.venv
|
||||
$STD uv pip install --python /opt/borg-ui/.venv -r requirements.txt
|
||||
msg_ok "Updated Python Environment"
|
||||
|
||||
msg_info "Starting Service"
|
||||
systemctl start borg-ui
|
||||
msg_ok "Started Service"
|
||||
msg_ok "Updated successfully!"
|
||||
fi
|
||||
exit
|
||||
}
|
||||
|
||||
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 "${GATEWAY}${BGN}http://${IP}:8081${CL}"
|
||||
6
ct/headers/borg-ui
Normal file
6
ct/headers/borg-ui
Normal file
@@ -0,0 +1,6 @@
|
||||
____ __ ______
|
||||
/ __ )____ _________ _ / / / / _/
|
||||
/ __ / __ \/ ___/ __ `/_____/ / / // /
|
||||
/ /_/ / /_/ / / / /_/ /_____/ /_/ // /
|
||||
/_____/\____/_/ \__, / \____/___/
|
||||
/____/
|
||||
6
ct/headers/valhalla
Normal file
6
ct/headers/valhalla
Normal file
@@ -0,0 +1,6 @@
|
||||
_ __ ____ ____
|
||||
| | / /___ _/ / /_ ____ _/ / /___ _
|
||||
| | / / __ `/ / __ \/ __ `/ / / __ `/
|
||||
| |/ / /_/ / / / / / /_/ / / / /_/ /
|
||||
|___/\__,_/_/_/ /_/\__,_/_/_/\__,_/
|
||||
|
||||
@@ -112,7 +112,7 @@ EOF
|
||||
msg_ok "Image-processing libraries up to date"
|
||||
fi
|
||||
|
||||
RELEASE="v3.2.0"
|
||||
RELEASE="v3.2.1"
|
||||
if check_for_gh_release "Immich" "immich-app/immich" "${RELEASE}" "each release is tested individually before the version is updated. Please do not open issues for this"; then
|
||||
if [[ $(cat ~/.immich) > "2.5.1" ]]; then
|
||||
msg_info "Enabling Maintenance Mode"
|
||||
|
||||
@@ -31,7 +31,7 @@ function update_script() {
|
||||
exit
|
||||
fi
|
||||
|
||||
NODE_VERSION="26" NPM_VERSION="11" setup_nodejs
|
||||
NODE_VERSION="24" NPM_VERSION="11" setup_nodejs
|
||||
|
||||
msg_info "Updating ${APP} LXC"
|
||||
$STD apt update
|
||||
|
||||
@@ -67,6 +67,7 @@ function update_script() {
|
||||
-e 's|${SPARKY_FITNESS_SERVER_PORT}|3010|g' \
|
||||
-e "s|\${SPARKY_FITNESS_FRONTEND_URL}|${FRONTEND_URL}|g" \
|
||||
-e 's|${NGINX_LISTEN_PORT}|80|g' \
|
||||
-e 's|${NGINX_RATE_LIMIT}|5r/s|g' \
|
||||
-e 's|${NGINX_ACCESS_LOG}|/var/log/nginx/sparkyfitness.access.log|g' \
|
||||
-e 's|${NGINX_ERROR_LOG}|/var/log/nginx/sparkyfitness.error.log|g' \
|
||||
-e 's|root /usr/share/nginx/html;|root /var/www/sparkyfitness;|g' \
|
||||
|
||||
@@ -42,7 +42,7 @@ function update_script() {
|
||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "spliit" "spliit-app/spliit" "tarball"
|
||||
|
||||
restore_backup
|
||||
NODE_VERSION="24" setup_nodejs
|
||||
NODE_VERSION="26" setup_nodejs
|
||||
|
||||
msg_info "Building Application"
|
||||
cd /opt/spliit
|
||||
|
||||
@@ -44,7 +44,8 @@ function update_script() {
|
||||
msg_ok "Stopped Service"
|
||||
|
||||
CLEAN_INSTALL=1 GITLAB_URL="https://gitlab.torproject.org" fetch_and_deploy_gl_release "tor-snowflake" "tpo/anti-censorship/pluggable-transports/snowflake" "tarball"
|
||||
GO_VERSION="$(grep -m1 '^go ' /opt/tor-snowflake/proxy/go.mod | awk '{print $2}')" setup_go
|
||||
GO_VERSION="$(awk '/^go /{print $2; exit}' /opt/tor-snowflake/go.mod 2>/dev/null || true)"
|
||||
GO_VERSION="${GO_VERSION:-latest}" setup_go
|
||||
|
||||
msg_info "Building Snowflake"
|
||||
cd /opt/tor-snowflake/proxy
|
||||
|
||||
@@ -124,7 +124,7 @@ EOF
|
||||
$STD pnpm turbo telemetry disable
|
||||
$STD pnpm turbo run build --no-daemon --filter=@tracearr/shared --filter=@tracearr/server --filter=@tracearr/web
|
||||
rm -rf /opt/tracearr
|
||||
mkdir -p /opt/tracearr/{packages/shared,apps/server,apps/web,apps/server/src/db}
|
||||
mkdir -p /opt/tracearr/{packages/shared,packages/emails,apps/server,apps/web,apps/server/src/db}
|
||||
cp -rf package.json /opt/tracearr/
|
||||
cp -rf pnpm-workspace.yaml /opt/tracearr/
|
||||
cp -rf pnpm-lock.yaml /opt/tracearr/
|
||||
@@ -134,6 +134,8 @@ EOF
|
||||
cp -rf apps/web/dist /opt/tracearr/apps/web/dist
|
||||
cp -rf packages/shared/package.json /opt/tracearr/packages/shared/
|
||||
cp -rf packages/shared/dist /opt/tracearr/packages/shared/dist
|
||||
cp -rf packages/emails/package.json /opt/tracearr/packages/emails/
|
||||
cp -rf packages/emails/dist /opt/tracearr/packages/emails/dist
|
||||
cp -rf apps/server/src/db/migrations /opt/tracearr/apps/server/src/db/migrations
|
||||
cp -rf data /opt/tracearr/data
|
||||
mkdir -p /opt/tracearr/data/image-cache
|
||||
|
||||
104
ct/valhalla.sh
Normal file
104
ct/valhalla.sh
Normal file
@@ -0,0 +1,104 @@
|
||||
#!/usr/bin/env bash
|
||||
_CS_DEFAULT_URL="https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main"
|
||||
_cs_boot="${COMMUNITY_SCRIPTS_CORE_DIR:-$(dirname "${BASH_SOURCE[0]}")/../../core}/core/build.func"
|
||||
source "$_cs_boot" 2>/dev/null || source <(curl -fsSL "${COMMUNITY_SCRIPTS_CORE_URL:-https://raw.githubusercontent.com/community-scripts/core/main}/core/build.func")
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: CrazyWolf13
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/valhalla/valhalla
|
||||
|
||||
APP="Valhalla"
|
||||
var_tags="${var_tags:-mapping;routing}"
|
||||
var_cpu="${var_cpu:-6}"
|
||||
var_ram="${var_ram:-6144}"
|
||||
var_disk="${var_disk:-24}"
|
||||
var_os="${var_os:-debian}"
|
||||
var_version="${var_version:-13}"
|
||||
var_arm64="${var_arm64:-yes}"
|
||||
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/valhalla.service ]]; then
|
||||
msg_error "No ${APP} Installation Found!"
|
||||
exit
|
||||
fi
|
||||
|
||||
if check_for_gh_release "prime_server" "kevinkreiser/prime_server"; then
|
||||
RELEASE="$CHECK_UPDATE_RELEASE"
|
||||
|
||||
msg_info "Stopping Service"
|
||||
systemctl stop valhalla
|
||||
msg_ok "Stopped Service"
|
||||
|
||||
msg_info "Building prime_server ${RELEASE} (Patience)"
|
||||
rm -rf /tmp/prime_server
|
||||
$STD git clone --recurse-submodules --depth 1 --branch "$RELEASE" https://github.com/kevinkreiser/prime_server /tmp/prime_server
|
||||
cd /tmp/prime_server
|
||||
$STD ./autogen.sh
|
||||
$STD ./configure
|
||||
$STD make -j"$(nproc)"
|
||||
$STD make install
|
||||
cd /
|
||||
rm -rf /tmp/prime_server
|
||||
ldconfig
|
||||
echo "${RELEASE#v}" >"$HOME/.prime_server"
|
||||
msg_ok "Built prime_server ${RELEASE}"
|
||||
|
||||
msg_info "Starting Service"
|
||||
systemctl start valhalla
|
||||
msg_ok "Started Service"
|
||||
fi
|
||||
|
||||
if check_for_gh_release "valhalla" "valhalla/valhalla"; then
|
||||
RELEASE="$CHECK_UPDATE_RELEASE"
|
||||
|
||||
msg_info "Stopping Service"
|
||||
systemctl stop valhalla
|
||||
msg_ok "Stopped Service"
|
||||
|
||||
msg_info "Fetching Valhalla ${RELEASE} (Patience)"
|
||||
rm -rf /opt/valhalla
|
||||
$STD git clone --recurse-submodules --depth 1 --branch "$RELEASE" https://github.com/valhalla/valhalla.git /opt/valhalla
|
||||
msg_ok "Fetched Valhalla ${RELEASE}"
|
||||
|
||||
msg_info "Compiling Valhalla ${RELEASE} (this takes 20-45+ minutes, be patient)"
|
||||
MEM_MB=$(awk '/MemTotal/{print int($2/1024)}' /proc/meminfo)
|
||||
BUILD_JOBS=$((MEM_MB / 2000))
|
||||
[[ $BUILD_JOBS -lt 1 ]] && BUILD_JOBS=1
|
||||
[[ $BUILD_JOBS -gt $(nproc) ]] && BUILD_JOBS=$(nproc)
|
||||
cd /opt/valhalla
|
||||
$STD cmake -B build -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON_BINDINGS=OFF -DENABLE_TESTS=OFF -DENABLE_SINGLE_FILES_WERROR=OFF
|
||||
$STD cmake --build build -- -j"$BUILD_JOBS"
|
||||
$STD cmake --install build
|
||||
ldconfig
|
||||
echo "${RELEASE#v}" >"$HOME/.valhalla"
|
||||
msg_ok "Compiled Valhalla ${RELEASE}"
|
||||
|
||||
msg_info "Starting Service"
|
||||
systemctl start valhalla
|
||||
msg_ok "Started Service"
|
||||
fi
|
||||
|
||||
msg_ok "Updated Successfully!\n"
|
||||
exit
|
||||
}
|
||||
|
||||
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 "${GATEWAY}${BGN}http://${IP}:8002/status${CL}"
|
||||
echo -e "${INFO}${YW}No routing tiles are built yet. Build them for your region with:${CL}"
|
||||
echo -e "${TAB}${BGN}/opt/valhalla_data/build-tiles.sh https://download.geofabrik.de/<continent>/<region>-latest.osm.pbf${CL}"
|
||||
125
install/borg-ui-install.sh
Normal file
125
install/borg-ui-install.sh
Normal file
@@ -0,0 +1,125 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: MickLesk (CanbiZ)
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/karanhudia/borg-ui
|
||||
|
||||
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
||||
color
|
||||
verb_ip6
|
||||
catch_errors
|
||||
setting_up_container
|
||||
network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt install -y \
|
||||
build-essential \
|
||||
python3-dev \
|
||||
pkg-config \
|
||||
libffi-dev \
|
||||
libssl-dev \
|
||||
libacl1-dev \
|
||||
liblz4-dev \
|
||||
libzstd-dev \
|
||||
libxxhash-dev \
|
||||
libfuse3-dev \
|
||||
fuse3 \
|
||||
rsync \
|
||||
sshfs \
|
||||
openssh-client
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
UV_PYTHON="3.12" setup_uv
|
||||
NODE_VERSION="22" setup_nodejs
|
||||
|
||||
fetch_and_deploy_gh_release "borg-ui" "karanhudia/borg-ui" "tarball"
|
||||
|
||||
# Only the three Borg pins appear in every release of this file; PYTHON_VERSION
|
||||
# and RCLONE_VERSION were added upstream after v2.2.6, so both fall back.
|
||||
RUNTIME_ENV="/opt/borg-ui/docker/runtime-base.env"
|
||||
BORG1_VERSION=$(sed -n 's/^BORG1_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORG2_VERSION=$(sed -n 's/^BORG2_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORGSTORE_VERSION=$(sed -n 's/^BORGSTORE_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
RCLONE_VERSION=$(sed -n 's/^RCLONE_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORG_PYTHON=$(sed -n 's/^PYTHON_VERSION=//p' "$RUNTIME_ENV" 2>/dev/null | tr -d ' \r')
|
||||
BORG_PYTHON="${BORG_PYTHON:-3.12}"
|
||||
if [[ -z "$BORG1_VERSION" || -z "$BORG2_VERSION" || -z "$BORGSTORE_VERSION" ]]; then
|
||||
msg_error "Could not read the pinned Borg versions from ${RUNTIME_ENV}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
msg_info "Installing Borg ${BORG1_VERSION} and Borg ${BORG2_VERSION} (Patience)"
|
||||
$STD uv venv --python "$BORG_PYTHON" /opt/borg1-venv
|
||||
$STD uv pip install --python /opt/borg1-venv pyfuse3 "borgbackup==${BORG1_VERSION}"
|
||||
echo "$BORG1_VERSION" >/opt/borg1-venv/.pinned_version
|
||||
$STD uv venv --python "$BORG_PYTHON" /opt/borg2-venv
|
||||
$STD uv pip install --python /opt/borg2-venv pyfuse3 "borgbackup==${BORG2_VERSION}" "borgstore[rclone,sftp,rest,s3,blake3]==${BORGSTORE_VERSION}"
|
||||
echo "${BORG2_VERSION}-${BORGSTORE_VERSION}" >/opt/borg2-venv/.pinned_version
|
||||
ln -sf /opt/borg1-venv/bin/borg /usr/local/bin/borg
|
||||
ln -sf /opt/borg2-venv/bin/borg /usr/local/bin/borg2
|
||||
msg_ok "Installed Borg ${BORG1_VERSION} and Borg ${BORG2_VERSION}"
|
||||
|
||||
RCLONE_TAG="${RCLONE_VERSION:+v${RCLONE_VERSION}}"
|
||||
fetch_and_deploy_gh_release "rclone" "rclone/rclone" "prebuild" "${RCLONE_TAG:-latest}" "/opt/rclone" "rclone-${RCLONE_TAG:-*}-linux-$(arch_resolve amd64 arm64).zip"
|
||||
ln -sf /opt/rclone/rclone /usr/local/bin/rclone
|
||||
|
||||
msg_info "Building Frontend"
|
||||
cd /opt/borg-ui/frontend
|
||||
$STD npm ci
|
||||
$STD npm run build
|
||||
mkdir -p /opt/borg-ui/app/static
|
||||
cp -r /opt/borg-ui/frontend/build/* /opt/borg-ui/app/static/
|
||||
msg_ok "Built Frontend"
|
||||
|
||||
msg_info "Setting up Python Environment"
|
||||
cd /opt/borg-ui
|
||||
$STD uv venv --python "$BORG_PYTHON" /opt/borg-ui/.venv
|
||||
$STD uv pip install --python /opt/borg-ui/.venv -r requirements.txt
|
||||
msg_ok "Set up Python Environment"
|
||||
|
||||
msg_info "Configuring Borg-UI"
|
||||
mkdir -p /opt/borg-ui_data
|
||||
BORG_UI_VERSION=$(cat "$HOME/.borg-ui" 2>/dev/null)
|
||||
if [[ -z "$BORG_UI_VERSION" ]]; then
|
||||
msg_error "Could not determine the deployed Borg-UI version"
|
||||
exit 1
|
||||
fi
|
||||
cat <<EOF >/opt/borg-ui/.env
|
||||
APP_VERSION=${BORG_UI_VERSION}
|
||||
PORT=8081
|
||||
ENVIRONMENT=production
|
||||
TZ=UTC
|
||||
DATA_DIR=/opt/borg-ui_data
|
||||
ENABLE_CRON_BACKUPS=true
|
||||
ENABLE_STARTUP_LICENSE_SYNC=false
|
||||
EOF
|
||||
chmod 600 /opt/borg-ui/.env
|
||||
msg_ok "Configured Borg-UI"
|
||||
|
||||
msg_info "Creating Service"
|
||||
cat <<EOF >/etc/systemd/system/borg-ui.service
|
||||
[Unit]
|
||||
Description=Borg-UI
|
||||
Wants=network-online.target
|
||||
After=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=root
|
||||
WorkingDirectory=/opt/borg-ui
|
||||
EnvironmentFile=/opt/borg-ui/.env
|
||||
ExecStart=/opt/borg-ui/.venv/bin/gunicorn app.main:app --bind 0.0.0.0:8081 --workers 2 --worker-class uvicorn.workers.UvicornWorker --timeout 300
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
systemctl enable -q --now borg-ui
|
||||
msg_ok "Created Service"
|
||||
|
||||
motd_ssh
|
||||
customize
|
||||
cleanup_lxc
|
||||
@@ -353,7 +353,7 @@ ML_DIR="${APP_DIR}/machine-learning"
|
||||
GEO_DIR="${INSTALL_DIR}/geodata"
|
||||
mkdir -p {"${APP_DIR}","${UPLOAD_DIR}","${GEO_DIR}","${INSTALL_DIR}"/cache}
|
||||
|
||||
fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v3.2.0" "$SRC_DIR"
|
||||
fetch_and_deploy_gh_release "Immich" "immich-app/immich" "tarball" "v3.2.1" "$SRC_DIR"
|
||||
PNPM_VERSION="$(jq -r '.packageManager | split("@")[1] | split("+")[0]' ${SRC_DIR}/package.json)"
|
||||
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||
NODE_VERSION="24" NODE_MODULE="corepack" setup_nodejs
|
||||
|
||||
@@ -28,7 +28,7 @@ if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
|
||||
exit 10
|
||||
fi
|
||||
|
||||
NODE_VERSION="26" NPM_VERSION="11" setup_nodejs
|
||||
NODE_VERSION="24" NPM_VERSION="11" setup_nodejs
|
||||
|
||||
msg_info "Installing ioBroker (Patience)"
|
||||
$STD bash <(curl -fsSL https://iobroker.net/install.sh)
|
||||
|
||||
@@ -86,6 +86,7 @@ sed \
|
||||
-e 's|${SPARKY_FITNESS_SERVER_PORT}|3010|g' \
|
||||
-e "s|\${SPARKY_FITNESS_FRONTEND_URL}|http://${LOCAL_IP}:80|g" \
|
||||
-e 's|${NGINX_LISTEN_PORT}|80|g' \
|
||||
-e 's|${NGINX_RATE_LIMIT}|5r/s|g' \
|
||||
-e 's|${NGINX_ACCESS_LOG}|/var/log/nginx/sparkyfitness.access.log|g' \
|
||||
-e 's|${NGINX_ERROR_LOG}|/var/log/nginx/sparkyfitness.error.log|g' \
|
||||
-e 's|root /usr/share/nginx/html;|root /var/www/sparkyfitness;|g' \
|
||||
|
||||
@@ -15,7 +15,7 @@ update_os
|
||||
|
||||
PG_VERSION="16" setup_postgresql
|
||||
PG_DB_NAME="spliit" PG_DB_USER="spliit" setup_postgresql_db
|
||||
NODE_VERSION="24" setup_nodejs
|
||||
NODE_VERSION="26" setup_nodejs
|
||||
fetch_and_deploy_gh_release "spliit" "spliit-app/spliit" "tarball"
|
||||
|
||||
msg_info "Configuring Application"
|
||||
|
||||
@@ -16,7 +16,8 @@ update_os
|
||||
|
||||
msg_info "Building Snowflake"
|
||||
GITLAB_URL="https://gitlab.torproject.org" fetch_and_deploy_gl_release "tor-snowflake" "tpo/anti-censorship/pluggable-transports/snowflake" "tarball"
|
||||
GO_VERSION="$(grep -m1 '^go ' /opt/tor-snowflake/proxy/go.mod | awk '{print $2}')" setup_go
|
||||
GO_VERSION="$(awk '/^go /{print $2; exit}' /opt/tor-snowflake/go.mod 2>/dev/null || true)"
|
||||
GO_VERSION="${GO_VERSION:-latest}" setup_go
|
||||
cd /opt/tor-snowflake/proxy
|
||||
$STD go build -o snowflake-proxy .
|
||||
msg_ok "Built Snowflake Proxy"
|
||||
|
||||
@@ -67,7 +67,7 @@ cd /opt/tracearr.build
|
||||
$STD pnpm install --frozen-lockfile --force
|
||||
$STD pnpm turbo telemetry disable
|
||||
$STD pnpm turbo run build --no-daemon --filter=@tracearr/shared --filter=@tracearr/server --filter=@tracearr/web
|
||||
mkdir -p /opt/tracearr/{packages/shared,apps/server,apps/web,apps/server/src/db}
|
||||
mkdir -p /opt/tracearr/{packages/shared,packages/emails,apps/server,apps/web,apps/server/src/db}
|
||||
cp -rf package.json /opt/tracearr/
|
||||
cp -rf pnpm-workspace.yaml /opt/tracearr/
|
||||
cp -rf pnpm-lock.yaml /opt/tracearr/
|
||||
@@ -77,6 +77,8 @@ cp -rf apps/server/scripts /opt/tracearr/apps/server/scripts
|
||||
cp -rf apps/web/dist /opt/tracearr/apps/web/dist
|
||||
cp -rf packages/shared/package.json /opt/tracearr/packages/shared/
|
||||
cp -rf packages/shared/dist /opt/tracearr/packages/shared/dist
|
||||
cp -rf packages/emails/package.json /opt/tracearr/packages/emails/
|
||||
cp -rf packages/emails/dist /opt/tracearr/packages/emails/dist
|
||||
cp -rf apps/server/src/db/migrations /opt/tracearr/apps/server/src/db/migrations
|
||||
cp -rf data /opt/tracearr/data
|
||||
mkdir -p /opt/tracearr/data/image-cache
|
||||
|
||||
187
install/valhalla-install.sh
Normal file
187
install/valhalla-install.sh
Normal file
@@ -0,0 +1,187 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: CrazyWolf13
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/valhalla/valhalla
|
||||
|
||||
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
||||
color
|
||||
verb_ip6
|
||||
catch_errors
|
||||
setting_up_container
|
||||
network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt install -y \
|
||||
autoconf \
|
||||
automake \
|
||||
ccache \
|
||||
clang \
|
||||
clang-tidy \
|
||||
coreutils \
|
||||
cmake \
|
||||
g++ \
|
||||
gcc \
|
||||
git \
|
||||
jq \
|
||||
lcov \
|
||||
libboost-all-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libczmq-dev \
|
||||
libgdal-dev \
|
||||
libgeos++-dev \
|
||||
libgeos-dev \
|
||||
libluajit-5.1-dev \
|
||||
liblz4-dev \
|
||||
libprotobuf-dev \
|
||||
libspatialite-dev \
|
||||
libsqlite3-dev \
|
||||
libsqlite3-mod-spatialite \
|
||||
libtool \
|
||||
libzmq3-dev \
|
||||
lld \
|
||||
locales \
|
||||
luajit \
|
||||
make \
|
||||
osmium-tool \
|
||||
parallel \
|
||||
pkgconf \
|
||||
protobuf-compiler \
|
||||
python3-all-dev \
|
||||
python3-shapely \
|
||||
python3-requests \
|
||||
python3-pip \
|
||||
spatialite-bin \
|
||||
unzip \
|
||||
zlib1g-dev
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
PRIME_SERVER_RELEASE=$(get_latest_github_release "kevinkreiser/prime_server" "false")
|
||||
msg_info "Building prime_server ${PRIME_SERVER_RELEASE} (Patience)"
|
||||
$STD git clone --recurse-submodules --depth 1 --branch "$PRIME_SERVER_RELEASE" https://github.com/kevinkreiser/prime_server /tmp/prime_server
|
||||
cd /tmp/prime_server
|
||||
$STD ./autogen.sh
|
||||
$STD ./configure
|
||||
$STD make -j"$(nproc)"
|
||||
$STD make install
|
||||
cd /
|
||||
rm -rf /tmp/prime_server
|
||||
echo "${PRIME_SERVER_RELEASE#v}" >"$HOME/.prime_server"
|
||||
msg_ok "Built prime_server"
|
||||
|
||||
RELEASE=$(get_latest_github_release "valhalla/valhalla" "false")
|
||||
msg_info "Cloning Valhalla ${RELEASE} (Patience)"
|
||||
mkdir -p /opt/valhalla
|
||||
$STD git clone --recurse-submodules --depth 1 --branch "$RELEASE" https://github.com/valhalla/valhalla.git /opt/valhalla
|
||||
msg_ok "Cloned Valhalla ${RELEASE}"
|
||||
|
||||
msg_info "Compiling Valhalla ${RELEASE} (this takes 20-45+ minutes, be patient)"
|
||||
MEM_MB=$(awk '/MemTotal/{print int($2/1024)}' /proc/meminfo)
|
||||
BUILD_JOBS=$((MEM_MB / 2000))
|
||||
[[ $BUILD_JOBS -lt 1 ]] && BUILD_JOBS=1
|
||||
[[ $BUILD_JOBS -gt $(nproc) ]] && BUILD_JOBS=$(nproc)
|
||||
cd /opt/valhalla
|
||||
$STD cmake -B build -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON_BINDINGS=OFF -DENABLE_TESTS=OFF -DENABLE_SINGLE_FILES_WERROR=OFF
|
||||
$STD cmake --build build -- -j"$BUILD_JOBS"
|
||||
$STD cmake --install build
|
||||
ldconfig
|
||||
echo "${RELEASE#v}" >"$HOME/.valhalla"
|
||||
msg_ok "Compiled Valhalla ${RELEASE}"
|
||||
|
||||
msg_info "Configuring Valhalla"
|
||||
useradd --system --no-create-home --shell /usr/sbin/nologin valhalla 2>/dev/null || true
|
||||
mkdir -p /opt/valhalla_data/{valhalla_tiles,pbf}
|
||||
THREADS=$(nproc)
|
||||
valhalla_build_config \
|
||||
--mjolnir-tile-dir /opt/valhalla_data/valhalla_tiles \
|
||||
--mjolnir-tile-extract /opt/valhalla_data/valhalla_tiles.tar \
|
||||
--mjolnir-admin /opt/valhalla_data/admins.sqlite \
|
||||
--mjolnir-timezone /opt/valhalla_data/timezones.sqlite \
|
||||
--mjolnir-concurrency "$THREADS" \
|
||||
>/opt/valhalla_data/valhalla.json
|
||||
|
||||
cat <<'EOF' >/opt/valhalla_data/build-tiles.sh
|
||||
#!/usr/bin/env bash
|
||||
# (Re)builds Valhalla routing tiles from one or more OSM extracts.
|
||||
# Usage: build-tiles.sh <pbf-url-or-path> [<pbf-url-or-path> ...]
|
||||
# Example: build-tiles.sh https://download.geofabrik.de/europe/germany-latest.osm.pbf
|
||||
set -euo pipefail
|
||||
export PATH="/usr/local/bin:/usr/local/sbin:$PATH"
|
||||
if [[ $# -eq 0 ]]; then
|
||||
echo "Usage: $0 <pbf-url-or-path> [<pbf-url-or-path> ...]" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
DATA_DIR=/opt/valhalla_data
|
||||
CONFIG="$DATA_DIR/valhalla.json"
|
||||
mkdir -p "$DATA_DIR/pbf"
|
||||
|
||||
FILES=()
|
||||
for src in "$@"; do
|
||||
if [[ "$src" == http://* || "$src" == https://* ]]; then
|
||||
fname="$DATA_DIR/pbf/$(basename "$src")"
|
||||
echo "Downloading $src"
|
||||
curl -fL --progress-bar -o "$fname" "$src"
|
||||
else
|
||||
fname="$src"
|
||||
fi
|
||||
FILES+=("$fname")
|
||||
done
|
||||
|
||||
systemctl stop valhalla
|
||||
|
||||
echo "Building admin database"
|
||||
valhalla_build_admins --config "$CONFIG" "${FILES[@]}"
|
||||
|
||||
echo "Building timezone database"
|
||||
valhalla_build_timezones >"$DATA_DIR/timezones.sqlite"
|
||||
|
||||
echo "Building initial tile graph"
|
||||
valhalla_build_tiles -c "$CONFIG" -e build "${FILES[@]}"
|
||||
|
||||
echo "Enhancing tile graph"
|
||||
valhalla_build_tiles -c "$CONFIG" -s enhance "${FILES[@]}"
|
||||
|
||||
echo "Packing tiles into a single extract"
|
||||
valhalla_build_extract -c "$CONFIG" -v
|
||||
|
||||
chown -R valhalla:valhalla "$DATA_DIR"
|
||||
systemctl start valhalla
|
||||
echo "Done. Tiles are in $DATA_DIR/valhalla_tiles (and packed at $DATA_DIR/valhalla_tiles.tar)."
|
||||
EOF
|
||||
chmod +x /opt/valhalla_data/build-tiles.sh
|
||||
chown -R valhalla:valhalla /opt/valhalla_data
|
||||
msg_ok "Configured Valhalla"
|
||||
|
||||
msg_info "Creating Service"
|
||||
cat <<EOF >/etc/systemd/system/valhalla.service
|
||||
[Unit]
|
||||
Description=Valhalla Routing Engine
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=valhalla
|
||||
Group=valhalla
|
||||
WorkingDirectory=/opt/valhalla_data
|
||||
ExecStart=/usr/local/bin/valhalla_service /opt/valhalla_data/valhalla.json ${THREADS}
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
systemctl enable -q --now valhalla
|
||||
msg_ok "Created Service"
|
||||
|
||||
if [[ -n "${VALHALLA_PBF_URLS:-}" ]]; then
|
||||
msg_info "Building Initial Tiles from VALHALLA_PBF_URLS (this can take a long time)"
|
||||
$STD /opt/valhalla_data/build-tiles.sh $VALHALLA_PBF_URLS
|
||||
msg_ok "Built Initial Tiles"
|
||||
fi
|
||||
|
||||
motd_ssh
|
||||
customize
|
||||
cleanup_lxc
|
||||
@@ -45,6 +45,8 @@ add() {
|
||||
excluded_instances=("$@")
|
||||
echo "Excluded instances: ${excluded_instances[@]}"
|
||||
|
||||
value_of() { sed -n "s/^$1:[[:space:]]*//p" <<<"$config" | head -n1; }
|
||||
|
||||
while true; do
|
||||
|
||||
for instance in $(pct list | awk 'NR>1 {print $1}'; qm list | awk 'NR>1 {print $1}'); do
|
||||
@@ -59,21 +61,21 @@ while true; do
|
||||
if [ -r "/etc/pve/lxc/$instance.conf" ]; then
|
||||
type="ct"
|
||||
config_file="/etc/pve/lxc/$instance.conf"
|
||||
else
|
||||
elif [ -r "/etc/pve/qemu-server/$instance.conf" ]; then
|
||||
type="vm"
|
||||
config_file="/etc/pve/qemu-server/$instance.conf"
|
||||
else
|
||||
echo "Skipping $instance because its config is no longer readable"
|
||||
continue
|
||||
fi
|
||||
config=$(sed '/^\[/,$d' "$config_file")
|
||||
|
||||
# Skip templates and onboot-disabled
|
||||
if grep -q "onboot: 0" <<<"$config" || ! grep -q "onboot" <<<"$config"; then
|
||||
onboot="true"
|
||||
else
|
||||
onboot="false"
|
||||
fi
|
||||
template=$(grep -q "^template:" <<<"$config" && echo "true" || echo "false")
|
||||
# Both are booleans that Proxmox also writes as 0, so the value decides and
|
||||
# not the presence of the key.
|
||||
[ "$(value_of onboot)" = "1" ] && onboot="true" || onboot="false"
|
||||
[ "$(value_of template)" = "1" ] && template="true" || template="false"
|
||||
|
||||
if [ "$onboot" == "true" ]; then
|
||||
if [ "$onboot" != "true" ]; then
|
||||
echo "Skipping $instance because it is set not to boot"
|
||||
continue
|
||||
elif [ "$template" == "true" ]; then
|
||||
@@ -81,34 +83,40 @@ while true; do
|
||||
continue
|
||||
fi
|
||||
|
||||
# Check for mon-restart tag
|
||||
has_tag=$(grep -q "tags:.*mon-restart" <<<"$config" && echo "true" || echo "false")
|
||||
if [ "$has_tag" != "true" ]; then
|
||||
# Tags are semicolon separated, so match a whole entry instead of a
|
||||
# substring of a longer tag such as mon-restart-disabled.
|
||||
tags=";$(value_of tags | tr -d '[:space:]');"
|
||||
if [[ "$tags" != *";mon-restart;"* ]]; then
|
||||
echo "Skipping $instance because it does not have 'mon-restart' tag"
|
||||
continue
|
||||
fi
|
||||
|
||||
# Responsiveness check and restart if needed
|
||||
if [ "$type" == "vm" ]; then
|
||||
# Check if guest agent responds
|
||||
if qm guest cmd $instance ping >/dev/null 2>&1; then
|
||||
if ! qm status "$instance" 2>/dev/null | grep -q "status: running"; then
|
||||
echo "$(date): VM $instance is not running, starting..."
|
||||
qm start "$instance" >/dev/null 2>&1
|
||||
elif qm guest cmd "$instance" ping >/dev/null 2>&1; then
|
||||
echo "VM $instance is responsive via guest agent"
|
||||
else
|
||||
echo "$(date): VM $instance is not responding to agent ping, restarting..."
|
||||
if qm status $instance | grep -q "status: running"; then
|
||||
qm stop $instance >/dev/null 2>&1
|
||||
sleep 5
|
||||
fi
|
||||
qm start $instance >/dev/null 2>&1
|
||||
qm stop "$instance" >/dev/null 2>&1
|
||||
sleep 5
|
||||
qm start "$instance" >/dev/null 2>&1
|
||||
fi
|
||||
else
|
||||
# Container: get IP and ping
|
||||
IP=$(pct exec $instance ip a s dev eth0 | awk '/inet / {print $2}' | cut -d/ -f1 | head -n1)
|
||||
if ! ping -c 1 $IP >/dev/null 2>&1; then
|
||||
if ! pct status "$instance" 2>/dev/null | grep -q "status: running"; then
|
||||
echo "$(date): CT $instance is not running, starting..."
|
||||
pct start "$instance" >/dev/null 2>&1
|
||||
continue
|
||||
fi
|
||||
# Not every container names its interface eth0.
|
||||
IP=$(pct exec "$instance" -- ip -4 -o addr show scope global 2>/dev/null | awk '{print $4}' | cut -d/ -f1 | head -n1)
|
||||
if [ -z "$IP" ] || ! ping -c 1 -W 2 "$IP" >/dev/null 2>&1; then
|
||||
echo "$(date): CT $instance is not responding, restarting..."
|
||||
pct stop $instance >/dev/null 2>&1
|
||||
pct stop "$instance" >/dev/null 2>&1
|
||||
sleep 5
|
||||
pct start $instance >/dev/null 2>&1
|
||||
pct start "$instance" >/dev/null 2>&1
|
||||
else
|
||||
echo "CT $instance is responsive"
|
||||
fi
|
||||
@@ -124,23 +132,18 @@ EOF
|
||||
touch /var/log/ping-instances.log
|
||||
chmod +x /usr/local/bin/ping-instances.sh
|
||||
|
||||
cat <<EOF >/etc/systemd/system/ping-instances.timer
|
||||
[Unit]
|
||||
Description=Delay ping-instances.service by 5 minutes
|
||||
|
||||
[Timer]
|
||||
OnBootSec=300
|
||||
OnUnitActiveSec=300
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
EOF
|
||||
# The service loops with its own five minute sleep, so the timer that earlier
|
||||
# versions installed could only ever start a unit that was already running.
|
||||
if [[ -f /etc/systemd/system/ping-instances.timer ]]; then
|
||||
systemctl disable -q --now ping-instances.timer 2>/dev/null || true
|
||||
rm -f /etc/systemd/system/ping-instances.timer
|
||||
fi
|
||||
|
||||
cat <<EOF >/etc/systemd/system/ping-instances.service
|
||||
[Unit]
|
||||
Description=Ping instances every 5 minutes and restart if necessary
|
||||
After=ping-instances.timer
|
||||
Requires=ping-instances.timer
|
||||
After=pve-cluster.service
|
||||
Wants=pve-cluster.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
@@ -158,7 +161,6 @@ WantedBy=multi-user.target
|
||||
EOF
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl enable -q --now ping-instances.timer
|
||||
systemctl enable -q --now ping-instances.service
|
||||
clear
|
||||
echo -e "\n Monitor All installed."
|
||||
@@ -167,7 +169,7 @@ EOF
|
||||
}
|
||||
|
||||
remove() {
|
||||
systemctl disable -q --now ping-instances.timer
|
||||
systemctl disable -q --now ping-instances.timer 2>/dev/null || true
|
||||
systemctl disable -q --now ping-instances.service
|
||||
rm -f /etc/systemd/system/ping-instances.service
|
||||
rm -f /etc/systemd/system/ping-instances.timer
|
||||
|
||||
Reference in New Issue
Block a user