mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-08-06 21:03:25 +02:00
Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3a9aa287b1 | |||
| a92cba7525 | |||
| d53486c86e | |||
| 4f80c217fc | |||
| f4afdfcd0c | |||
| 3865f855f0 | |||
| 94da6eeb83 | |||
| 078a76f263 | |||
| 58d819b2f4 | |||
| 1c03d0506c | |||
| 27f66a8016 | |||
| e3e29667c6 | |||
| 3921f03b73 | |||
| 1336b44a26 | |||
| 419f9e397e | |||
| fcbaedf7d8 | |||
| 4eb022fceb | |||
| 6f4d3b4841 | |||
| a4f893eb7c | |||
| 44589819d1 | |||
| 33bfae30e0 | |||
| 3fa516f94b |
+21
-1
@@ -518,16 +518,36 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
|
## 2026-08-05
|
||||||
|
|
||||||
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
|
- #### ✨ New Features
|
||||||
|
|
||||||
|
- NextcloudPI: Bump to Debian Trixie & Tweak broken SSH [@MickLesk](https://github.com/MickLesk) ([#15957](https://github.com/community-scripts/ProxmoxVE/pull/15957))
|
||||||
|
|
||||||
|
### 🧰 Tools
|
||||||
|
|
||||||
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- fix(monitor-all): reduce polling CPU overhead [@jomplox](https://github.com/jomplox) ([#15907](https://github.com/community-scripts/ProxmoxVE/pull/15907))
|
||||||
|
|
||||||
## 2026-08-04
|
## 2026-08-04
|
||||||
|
|
||||||
### 🆕 New Scripts
|
### 🆕 New Scripts
|
||||||
|
|
||||||
- Obsidian-LiveSync ([#16233](https://github.com/community-scripts/ProxmoxVE/pull/16233))
|
- Hister ([#16259](https://github.com/community-scripts/ProxmoxVE/pull/16259))
|
||||||
|
- Obsidian-LiveSync ([#16233](https://github.com/community-scripts/ProxmoxVE/pull/16233))
|
||||||
|
|
||||||
### 🚀 Updated Scripts
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
- #### 🐞 Bug Fixes
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- Actual Budget: allow native module install scripts under npm 11 (Node24) [@MickLesk](https://github.com/MickLesk) ([#16277](https://github.com/community-scripts/ProxmoxVE/pull/16277))
|
||||||
|
- Heimdall-Dashboard: run full composer install on update, force production env [@MickLesk](https://github.com/MickLesk) ([#16278](https://github.com/community-scripts/ProxmoxVE/pull/16278))
|
||||||
|
- xyOps: rebuild xySat satellite during update [@MickLesk](https://github.com/MickLesk) ([#16279](https://github.com/community-scripts/ProxmoxVE/pull/16279))
|
||||||
|
- HAOS: remove non-ASCII dash from CPU model dialog text [@MickLesk](https://github.com/MickLesk) ([#16276](https://github.com/community-scripts/ProxmoxVE/pull/16276))
|
||||||
|
- fix: back up Termix db/data so the update stops destroying encryption keys [@LukeGus](https://github.com/LukeGus) ([#16275](https://github.com/community-scripts/ProxmoxVE/pull/16275))
|
||||||
- passwordpusher: dynamically read Ruby version from .ruby-version file [@Copilot](https://github.com/Copilot) ([#16242](https://github.com/community-scripts/ProxmoxVE/pull/16242))
|
- passwordpusher: dynamically read Ruby version from .ruby-version file [@Copilot](https://github.com/Copilot) ([#16242](https://github.com/community-scripts/ProxmoxVE/pull/16242))
|
||||||
- fix(salt): write version cache to ~/.salt, not /~.salt [@TowyTowy](https://github.com/TowyTowy) ([#16265](https://github.com/community-scripts/ProxmoxVE/pull/16265))
|
- fix(salt): write version cache to ~/.salt, not /~.salt [@TowyTowy](https://github.com/TowyTowy) ([#16265](https://github.com/community-scripts/ProxmoxVE/pull/16265))
|
||||||
- AFFiNE: fix version and build type reported by the app itself [@MickLesk](https://github.com/MickLesk) ([#16251](https://github.com/community-scripts/ProxmoxVE/pull/16251))
|
- AFFiNE: fix version and build type reported by the app itself [@MickLesk](https://github.com/MickLesk) ([#16251](https://github.com/community-scripts/ProxmoxVE/pull/16251))
|
||||||
|
|||||||
@@ -39,7 +39,9 @@ function update_script() {
|
|||||||
msg_ok "Stopped Service"
|
msg_ok "Stopped Service"
|
||||||
|
|
||||||
msg_info "Updating Actual Budget to ${RELEASE}"
|
msg_info "Updating Actual Budget to ${RELEASE}"
|
||||||
|
$STD npm config set allow-scripts=bcrypt,better-sqlite3,argon2 --location=global
|
||||||
$STD npm update -g @actual-app/sync-server
|
$STD npm update -g @actual-app/sync-server
|
||||||
|
$STD npm rebuild -g
|
||||||
echo "${RELEASE}" >~/.actualbudget
|
echo "${RELEASE}" >~/.actualbudget
|
||||||
msg_ok "Updated Actual Budget to ${RELEASE}"
|
msg_ok "Updated Actual Budget to ${RELEASE}"
|
||||||
|
|
||||||
|
|||||||
@@ -42,20 +42,6 @@ function update_script() {
|
|||||||
echo -e "${TAB}${TAB}${GN}bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/portainer.sh)\"${CL}"
|
echo -e "${TAB}${TAB}${GN}bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/portainer.sh)\"${CL}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if docker ps -a --format '{{.Names}}' | grep -q '^portainer_agent$'; then
|
|
||||||
msg_info "Updating Portainer Agent"
|
|
||||||
$STD docker pull portainer/agent:latest
|
|
||||||
$STD docker stop portainer_agent
|
|
||||||
$STD docker rm portainer_agent
|
|
||||||
$STD docker run -d \
|
|
||||||
-p 9001:9001 \
|
|
||||||
--name=portainer_agent \
|
|
||||||
--restart=always \
|
|
||||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
|
||||||
-v /var/lib/docker/volumes:/var/lib/docker/volumes \
|
|
||||||
portainer/agent
|
|
||||||
msg_ok "Updated Portainer Agent"
|
|
||||||
fi
|
|
||||||
msg_ok "Updated successfully!"
|
msg_ok "Updated successfully!"
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
__ ___ __
|
||||||
|
/ / / (_)____/ /____ _____
|
||||||
|
/ /_/ / / ___/ __/ _ \/ ___/
|
||||||
|
/ __ / (__ ) /_/ __/ /
|
||||||
|
/_/ /_/_/____/\__/\___/_/
|
||||||
|
|
||||||
@@ -46,8 +46,11 @@ function update_script() {
|
|||||||
|
|
||||||
msg_info "Updating Heimdall-Dashboard"
|
msg_info "Updating Heimdall-Dashboard"
|
||||||
cd /opt/Heimdall
|
cd /opt/Heimdall
|
||||||
|
sed -i 's/^APP_ENV=.*/APP_ENV=production/' .env
|
||||||
|
rm -f bootstrap/cache/*.php
|
||||||
export COMPOSER_ALLOW_SUPERUSER=1
|
export COMPOSER_ALLOW_SUPERUSER=1
|
||||||
$STD composer dump-autoload
|
$STD composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader
|
||||||
|
$STD php artisan optimize:clear
|
||||||
msg_ok "Updated Heimdall-Dashboard"
|
msg_ok "Updated Heimdall-Dashboard"
|
||||||
|
|
||||||
msg_info "Restoring Data"
|
msg_info "Restoring Data"
|
||||||
|
|||||||
@@ -0,0 +1,55 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/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/asciimoo/hister
|
||||||
|
|
||||||
|
APP="Hister"
|
||||||
|
var_tags="${var_tags:-search;browser-history;personal}"
|
||||||
|
var_cpu="${var_cpu:-1}"
|
||||||
|
var_ram="${var_ram:-1024}"
|
||||||
|
var_disk="${var_disk:-20}"
|
||||||
|
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 /usr/local/bin/hister ]]; then
|
||||||
|
msg_error "No ${APP} Installation Found!"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if check_for_gh_release "hister" "asciimoo/hister"; then
|
||||||
|
msg_info "Stopping Service"
|
||||||
|
systemctl stop hister
|
||||||
|
msg_ok "Stopped Service"
|
||||||
|
|
||||||
|
fetch_and_deploy_gh_release "hister" "asciimoo/hister" "singlefile" "latest" "/usr/local/bin" "hister_*_linux_$(arch_resolve)"
|
||||||
|
|
||||||
|
msg_info "Starting Service"
|
||||||
|
systemctl start hister
|
||||||
|
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}:4433${CL}"
|
||||||
+1
-1
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
|
|||||||
var_ram="${var_ram:-2048}"
|
var_ram="${var_ram:-2048}"
|
||||||
var_disk="${var_disk:-8}"
|
var_disk="${var_disk:-8}"
|
||||||
var_os="${var_os:-debian}"
|
var_os="${var_os:-debian}"
|
||||||
var_version="${var_version:-12}"
|
var_version="${var_version:-13}"
|
||||||
var_arm64="${var_arm64:-yes}"
|
var_arm64="${var_arm64:-yes}"
|
||||||
var_unprivileged="${var_unprivileged:-1}"
|
var_unprivileged="${var_unprivileged:-1}"
|
||||||
|
|
||||||
|
|||||||
+37
-9
@@ -112,14 +112,33 @@ EOF
|
|||||||
msg_ok "Stopped Termix"
|
msg_ok "Stopped Termix"
|
||||||
|
|
||||||
msg_info "Migrating Configuration"
|
msg_info "Migrating Configuration"
|
||||||
if [[ ! -f /opt/termix/.env ]]; then
|
mkdir -p /opt/termix/db/data
|
||||||
|
|
||||||
|
if [[ -f /opt/termix/data/db.sqlite.encrypted && ! -f /opt/termix/db/data/db.sqlite.encrypted ]]; then
|
||||||
|
cp -a /opt/termix/data/db.sqlite.encrypted /opt/termix/db/data/db.sqlite.encrypted
|
||||||
|
[[ -f /opt/termix/data/db.sqlite.encrypted.meta ]] &&
|
||||||
|
cp -a /opt/termix/data/db.sqlite.encrypted.meta /opt/termix/db/data/db.sqlite.encrypted.meta
|
||||||
|
[[ -f /opt/termix/data/db.sqlite ]] &&
|
||||||
|
cp -a /opt/termix/data/db.sqlite /opt/termix/db/data/db.sqlite
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -f /opt/termix/data/.env && ! -f /opt/termix/db/data/.env ]]; then
|
||||||
|
cp -a /opt/termix/data/.env /opt/termix/db/data/.env
|
||||||
|
fi
|
||||||
|
|
||||||
|
for sub in ssl session_logs session_recordings acme-webroot certbot uploads; do
|
||||||
|
if [[ -d /opt/termix/data/$sub && ! -d /opt/termix/db/data/$sub ]]; then
|
||||||
|
cp -a "/opt/termix/data/$sub" "/opt/termix/db/data/$sub"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
cat <<EOF >/opt/termix/.env
|
cat <<EOF >/opt/termix/.env
|
||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
DATA_DIR=/opt/termix/data
|
DATA_DIR=/opt/termix/db/data
|
||||||
GUACD_HOST=127.0.0.1
|
GUACD_HOST=127.0.0.1
|
||||||
GUACD_PORT=4822
|
GUACD_PORT=4822
|
||||||
EOF
|
EOF
|
||||||
fi
|
|
||||||
if ! grep -q "EnvironmentFile" /etc/systemd/system/termix.service 2>/dev/null; then
|
if ! grep -q "EnvironmentFile" /etc/systemd/system/termix.service 2>/dev/null; then
|
||||||
cat <<EOF >/etc/systemd/system/termix.service
|
cat <<EOF >/etc/systemd/system/termix.service
|
||||||
[Unit]
|
[Unit]
|
||||||
@@ -143,7 +162,11 @@ EOF
|
|||||||
fi
|
fi
|
||||||
msg_ok "Migrated Configuration"
|
msg_ok "Migrated Configuration"
|
||||||
|
|
||||||
create_backup /opt/termix/data /opt/termix/uploads /opt/termix/.env
|
create_backup \
|
||||||
|
/opt/termix/db/data \
|
||||||
|
/opt/termix/data \
|
||||||
|
/opt/termix/uploads \
|
||||||
|
/opt/termix/.env
|
||||||
|
|
||||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "termix" "Termix-SSH/Termix" "tarball"
|
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "termix" "Termix-SSH/Termix" "tarball"
|
||||||
|
|
||||||
@@ -158,10 +181,10 @@ EOF
|
|||||||
/opt/termix/db/data
|
/opt/termix/db/data
|
||||||
msg_ok "Recreated Directories"
|
msg_ok "Recreated Directories"
|
||||||
|
|
||||||
if [[ -f /opt/termix/data/db.sqlite.encrypted && ! -f /opt/termix/db/data/db.sqlite.encrypted ]]; then
|
if [[ -f /opt/termix/db/data/db.sqlite.encrypted && ! -f /opt/termix/db/data/.env ]]; then
|
||||||
msg_info "Migrating Database to new layout"
|
msg_error "Encrypted database restored without its keys (/opt/termix/db/data/.env is missing)"
|
||||||
cp -a /opt/termix/data/db.sqlite.encrypted /opt/termix/db/data/db.sqlite.encrypted
|
msg_custom "🛟" "Restore the container from a backup and report this at https://github.com/community-scripts/ProxmoxVE/issues"
|
||||||
msg_ok "Migrated Database to new layout"
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
msg_info "Building Frontend"
|
msg_info "Building Frontend"
|
||||||
@@ -237,7 +260,12 @@ EOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
msg_info "Starting Termix"
|
msg_info "Starting Termix"
|
||||||
systemctl start termix
|
systemctl daemon-reload
|
||||||
|
if ! systemctl start termix; then
|
||||||
|
msg_error "Termix failed to start"
|
||||||
|
journalctl -u termix -n 30 --no-pager || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
msg_ok "Started Termix"
|
msg_ok "Started Termix"
|
||||||
msg_ok "Updated successfully!"
|
msg_ok "Updated successfully!"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -48,6 +48,13 @@ function update_script() {
|
|||||||
chmod 644 /opt/xyops/node_modules/useragent-ng/lib/regexps.js
|
chmod 644 /opt/xyops/node_modules/useragent-ng/lib/regexps.js
|
||||||
msg_ok "Rebuilt Application"
|
msg_ok "Rebuilt Application"
|
||||||
|
|
||||||
|
fetch_and_deploy_gh_release "xysat" "pixlcore/xysat" "tarball" "latest" "/opt/xyops/satellite"
|
||||||
|
|
||||||
|
msg_info "Building xySat Satellite"
|
||||||
|
cd /opt/xyops/satellite
|
||||||
|
$STD npm install
|
||||||
|
msg_ok "Built xySat Satellite"
|
||||||
|
|
||||||
msg_info "Starting Service"
|
msg_info "Starting Service"
|
||||||
systemctl start xyops
|
systemctl start xyops
|
||||||
msg_ok "Started Service"
|
msg_ok "Started Service"
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ cat <<EOF >/opt/actualbudget-data/config.json
|
|||||||
EOF
|
EOF
|
||||||
mkdir -p /opt/actualbudget
|
mkdir -p /opt/actualbudget
|
||||||
cd /opt/actualbudget
|
cd /opt/actualbudget
|
||||||
|
$STD npm config set allow-scripts=bcrypt,better-sqlite3,argon2 --location=global
|
||||||
$STD npm install --location=global @actual-app/sync-server
|
$STD npm install --location=global @actual-app/sync-server
|
||||||
echo "${RELEASE}" >~/.actualbudget
|
echo "${RELEASE}" >~/.actualbudget
|
||||||
msg_ok "Installed Actual Budget"
|
msg_ok "Installed Actual Budget"
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ fetch_and_deploy_gh_release "Heimdall" "linuxserver/Heimdall" "tarball"
|
|||||||
msg_info "Setting up Heimdall-Dashboard"
|
msg_info "Setting up Heimdall-Dashboard"
|
||||||
cd /opt/Heimdall
|
cd /opt/Heimdall
|
||||||
cp .env.example .env
|
cp .env.example .env
|
||||||
|
sed -i 's/^APP_ENV=.*/APP_ENV=production/' .env
|
||||||
$STD php artisan key:generate
|
$STD php artisan key:generate
|
||||||
msg_ok "Setup Heimdall-Dashboard"
|
msg_ok "Setup Heimdall-Dashboard"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
#!/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/asciimoo/hister
|
||||||
|
|
||||||
|
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
||||||
|
color
|
||||||
|
verb_ip6
|
||||||
|
catch_errors
|
||||||
|
setting_up_container
|
||||||
|
network_check
|
||||||
|
update_os
|
||||||
|
|
||||||
|
fetch_and_deploy_gh_release "hister" "asciimoo/hister" "singlefile" "latest" "/usr/local/bin" "hister_*_linux_$(arch_resolve)"
|
||||||
|
|
||||||
|
msg_info "Configuring Hister"
|
||||||
|
mkdir -p /opt/hister/data /etc/hister
|
||||||
|
LOCAL_IP=$(hostname -I | awk '{print $1}')
|
||||||
|
cat <<EOF >/etc/hister/config.yaml
|
||||||
|
app:
|
||||||
|
directory: '/opt/hister/data'
|
||||||
|
server:
|
||||||
|
address: '0.0.0.0:4433'
|
||||||
|
base_url: 'http://${LOCAL_IP}:4433'
|
||||||
|
EOF
|
||||||
|
msg_ok "Configured Hister"
|
||||||
|
|
||||||
|
msg_info "Creating Service"
|
||||||
|
cat <<EOF >/etc/systemd/system/hister.service
|
||||||
|
[Unit]
|
||||||
|
Description=Hister Search Engine
|
||||||
|
After=network.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=root
|
||||||
|
ExecStart=/usr/local/bin/hister listen --config /etc/hister/config.yaml
|
||||||
|
Restart=on-failure
|
||||||
|
RestartSec=5
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOF
|
||||||
|
systemctl enable -q --now hister
|
||||||
|
msg_ok "Created Service"
|
||||||
|
|
||||||
|
motd_ssh
|
||||||
|
customize
|
||||||
|
cleanup_lxc
|
||||||
@@ -24,6 +24,16 @@ if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
|
|||||||
exit 10
|
exit 10
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
msg_info "Making ssh.service reloads behave like restarts"
|
||||||
|
mkdir -p /etc/systemd/system/ssh.service.d
|
||||||
|
cat <<'EOF' >/etc/systemd/system/ssh.service.d/reload-as-restart.conf
|
||||||
|
[Service]
|
||||||
|
ExecReload=
|
||||||
|
ExecReload=/usr/bin/systemd-run --no-block --quiet /bin/systemctl restart ssh.service
|
||||||
|
EOF
|
||||||
|
systemctl daemon-reload
|
||||||
|
msg_ok "Made ssh.service reloads behave like restarts"
|
||||||
|
|
||||||
msg_info "Installing NextCloudPi (Patience)"
|
msg_info "Installing NextCloudPi (Patience)"
|
||||||
$STD bash <(curl -fsSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh)
|
$STD bash <(curl -fsSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh)
|
||||||
msg_ok "Installed NextCloudPi"
|
msg_ok "Installed NextCloudPi"
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ EOF
|
|||||||
|
|
||||||
cat <<EOF >/opt/termix/.env
|
cat <<EOF >/opt/termix/.env
|
||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
DATA_DIR=/opt/termix/data
|
DATA_DIR=/opt/termix/db/data
|
||||||
GUACD_HOST=127.0.0.1
|
GUACD_HOST=127.0.0.1
|
||||||
GUACD_PORT=4822
|
GUACD_PORT=4822
|
||||||
EOF
|
EOF
|
||||||
|
|||||||
+8
-9
@@ -5200,15 +5200,11 @@ EOF
|
|||||||
# TSTP = Ctrl+Z, TTIN = bg read from tty, TTOU = bg write to tty (tostop)
|
# TSTP = Ctrl+Z, TTIN = bg read from tty, TTOU = bg write to tty (tostop)
|
||||||
trap '' TSTP TTIN TTOU
|
trap '' TSTP TTIN TTOU
|
||||||
|
|
||||||
# lxc-attach takes the controlling terminal while the install runs and does
|
# lxc-attach left us in a background process group - claim the terminal back
|
||||||
# not hand it back, leaving us in a background process group. Reading from
|
# before we print anything. Note this does NOT hold: the log collection
|
||||||
# the terminal then returns EIO instead of blocking, because SIGTTIN is
|
# below uses pct pull/exec, which take it away again, so every interactive
|
||||||
# ignored above - so every recovery prompt fails before the user can answer.
|
# prompt has to reclaim it again right before its read.
|
||||||
# Redirecting to /dev/tty does not help: the rule applies to the terminal,
|
reclaim_tty
|
||||||
# not the file descriptor. Claim the foreground group back; SIGTTOU is
|
|
||||||
# ignored too, so tcsetpgrp() succeeds instead of stopping us. No-op when we
|
|
||||||
# already are in the foreground. perl is a hard dependency of Proxmox VE.
|
|
||||||
perl -e 'use POSIX; open(my $t, "+<", "/dev/tty") or exit 1; POSIX::tcsetpgrp(fileno($t), getpgrp()) or exit 1;' 2>/dev/null || true
|
|
||||||
|
|
||||||
msg_error "Installation failed in container ${CTID} (exit code: ${install_exit_code})"
|
msg_error "Installation failed in container ${CTID} (exit code: ${install_exit_code})"
|
||||||
|
|
||||||
@@ -5338,6 +5334,7 @@ EOF
|
|||||||
pct enter "$CTID"
|
pct enter "$CTID"
|
||||||
echo ""
|
echo ""
|
||||||
echo -en "${YW}Container ${CTID} still running. Remove now? (y/N): ${CL}"
|
echo -en "${YW}Container ${CTID} still running. Remove now? (y/N): ${CL}"
|
||||||
|
reclaim_tty
|
||||||
if read -r response </dev/tty && [[ "$response" =~ ^[Yy]$ ]]; then
|
if read -r response </dev/tty && [[ "$response" =~ ^[Yy]$ ]]; then
|
||||||
pct stop "$CTID" &>/dev/null || true
|
pct stop "$CTID" &>/dev/null || true
|
||||||
pct destroy "$CTID" &>/dev/null || true
|
pct destroy "$CTID" &>/dev/null || true
|
||||||
@@ -5497,6 +5494,7 @@ EOF
|
|||||||
|
|
||||||
local response=""
|
local response=""
|
||||||
local read_rc
|
local read_rc
|
||||||
|
reclaim_tty
|
||||||
read -t 60 -r response </dev/tty
|
read -t 60 -r response </dev/tty
|
||||||
read_rc=$?
|
read_rc=$?
|
||||||
if [[ $read_rc -eq 0 ]]; then
|
if [[ $read_rc -eq 0 ]]; then
|
||||||
@@ -5761,6 +5759,7 @@ destroy_lxc() {
|
|||||||
trap 'echo; msg_error "Aborted by user (SIGINT/SIGQUIT)"; return 130' INT QUIT
|
trap 'echo; msg_error "Aborted by user (SIGINT/SIGQUIT)"; return 130' INT QUIT
|
||||||
|
|
||||||
local prompt
|
local prompt
|
||||||
|
reclaim_tty
|
||||||
if ! read -rp "Remove this Container? <y/N> " prompt </dev/tty; then
|
if ! read -rp "Remove this Container? <y/N> " prompt </dev/tty; then
|
||||||
# read returns non-zero on Ctrl-D/ESC
|
# read returns non-zero on Ctrl-D/ESC
|
||||||
msg_error "Aborted input (Ctrl-D/ESC)"
|
msg_error "Aborted input (Ctrl-D/ESC)"
|
||||||
|
|||||||
@@ -1042,6 +1042,39 @@ ensure_tput() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
# reclaim_tty()
|
||||||
|
#
|
||||||
|
# - Reclaims the controlling terminal's foreground process group
|
||||||
|
# - lxc-attach takes the terminal and does not hand it back, leaving us in a
|
||||||
|
# background process group. Reading from the terminal then returns EIO
|
||||||
|
# instead of blocking, because SIGTTIN is ignored during recovery - so the
|
||||||
|
# prompt fails before the user can answer and their keystroke leaks into the
|
||||||
|
# parent shell. Redirecting to /dev/tty does not help: the rule applies to
|
||||||
|
# the terminal, not to the file descriptor.
|
||||||
|
# - pct exec/pull/enter use lxc-attach internally, so the terminal can be taken
|
||||||
|
# away again at any point. Call this immediately before each interactive
|
||||||
|
# read, not once after the install.
|
||||||
|
# - SIGTTOU is ignored inside perl so tcsetpgrp() succeeds instead of stopping
|
||||||
|
# us. No-op when we already are in the foreground or there is no terminal.
|
||||||
|
# perl is a hard dependency of Proxmox VE.
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
reclaim_tty() {
|
||||||
|
command -v perl >/dev/null 2>&1 || return 0
|
||||||
|
[[ -e /dev/tty ]] || return 0
|
||||||
|
|
||||||
|
local pgid
|
||||||
|
pgid=$(ps -o pgid= -p $$ 2>/dev/null | tr -d ' ') || true
|
||||||
|
|
||||||
|
perl -e '
|
||||||
|
use POSIX;
|
||||||
|
$SIG{TTOU} = "IGNORE";
|
||||||
|
my $pgid = $ARGV[0] || POSIX::getpgrp();
|
||||||
|
open(my $t, "+<", "/dev/tty") or exit 1;
|
||||||
|
POSIX::tcsetpgrp(fileno($t), $pgid) or exit 1;
|
||||||
|
' "${pgid:-0}" 2>/dev/null || true
|
||||||
|
}
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# is_alpine()
|
# is_alpine()
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -499,6 +499,7 @@ error_handler() {
|
|||||||
|
|
||||||
local response=""
|
local response=""
|
||||||
local read_rc
|
local read_rc
|
||||||
|
declare -f reclaim_tty >/dev/null 2>&1 && reclaim_tty
|
||||||
read -t 60 -r response </dev/tty
|
read -t 60 -r response </dev/tty
|
||||||
read_rc=$?
|
read_rc=$?
|
||||||
if [[ $read_rc -eq 0 ]]; then
|
if [[ $read_rc -eq 0 ]]; then
|
||||||
|
|||||||
+5
-36
@@ -4801,8 +4801,8 @@ EOF
|
|||||||
|
|
||||||
# Container Update Check
|
# Container Update Check
|
||||||
# - Skipped entirely when running unattended / non-interactive
|
# - Skipped entirely when running unattended / non-interactive
|
||||||
# - Compose-managed containers: offered via Y/N → docker compose pull + up -d
|
# - Lists containers with a newer image available and the command to update
|
||||||
# - Standalone containers: offered via Y/N → image pull only (no stop/rm)
|
# them; does not pull/recreate anything itself
|
||||||
if [ "$docker_installed" = true ] && ! _docker_is_noninteractive; then
|
if [ "$docker_installed" = true ] && ! _docker_is_noninteractive; then
|
||||||
msg_info "Checking for container updates"
|
msg_info "Checking for container updates"
|
||||||
|
|
||||||
@@ -4840,41 +4840,14 @@ EOF
|
|||||||
if [[ ${#compose_updates[@]} -eq 0 && ${#standalone_updates[@]} -eq 0 ]]; then
|
if [[ ${#compose_updates[@]} -eq 0 && ${#standalone_updates[@]} -eq 0 ]]; then
|
||||||
msg_ok "All containers are up-to-date"
|
msg_ok "All containers are up-to-date"
|
||||||
else
|
else
|
||||||
local reply
|
msg_warn "Updates available (not applied automatically):"
|
||||||
for entry in "${compose_updates[@]}"; do
|
for entry in "${compose_updates[@]}"; do
|
||||||
IFS='|' read -r name image compose_workdir compose_service <<<"$entry"
|
IFS='|' read -r name image compose_workdir compose_service <<<"$entry"
|
||||||
reply=""
|
echo -e "${TAB3}${name} (${image}) — update via: cd ${compose_workdir} && docker compose pull ${compose_service} && docker compose up -d ${compose_service}"
|
||||||
if read -r -t 60 -p "${TAB3}Update ${name} (${image}) via Compose? <y/N> (auto-no in 60s): " reply </dev/tty; then
|
|
||||||
echo ""
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
if [[ "${reply,,}" =~ ^(y|yes)$ ]]; then
|
|
||||||
msg_info "Updating $name"
|
|
||||||
if (cd "$compose_workdir" && $STD docker compose pull "$compose_service" && $STD docker compose up -d "$compose_service"); then
|
|
||||||
msg_ok "Updated $name"
|
|
||||||
else
|
|
||||||
msg_warn "Could not update $name — try manually in $compose_workdir"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
for entry in "${standalone_updates[@]}"; do
|
for entry in "${standalone_updates[@]}"; do
|
||||||
IFS='|' read -r name image <<<"$entry"
|
IFS='|' read -r name image <<<"$entry"
|
||||||
reply=""
|
echo -e "${TAB3}${name} (${image}) — update via: docker pull ${image} && docker restart ${name}"
|
||||||
if read -r -t 60 -p "${TAB3}Pull new image for ${name} (${image})? <y/N> (auto-no in 60s): " reply </dev/tty; then
|
|
||||||
echo ""
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
if [[ "${reply,,}" =~ ^(y|yes)$ ]]; then
|
|
||||||
msg_info "Pulling new image for $name"
|
|
||||||
if $STD docker pull "$image"; then
|
|
||||||
msg_ok "New image available for $name — recreate the container to apply the update"
|
|
||||||
else
|
|
||||||
msg_warn "Failed to pull image for $name"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
@@ -7732,10 +7705,6 @@ setup_nodejs() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$(npm -v 2>/dev/null | cut -d. -f1)" -ge 11 ]]; then
|
|
||||||
$STD npm config set dangerously-allow-all-scripts true --location=global 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Set a safe default heap limit for Node.js builds if not explicitly provided.
|
# Set a safe default heap limit for Node.js builds if not explicitly provided.
|
||||||
# Priority:
|
# Priority:
|
||||||
# 1) NODE_OPTIONS (caller/user override)
|
# 1) NODE_OPTIONS (caller/user override)
|
||||||
|
|||||||
@@ -49,6 +49,22 @@ function uninstall() {
|
|||||||
msg_ok "${APP} has been uninstalled"
|
msg_ok "${APP} has been uninstalled"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# ==============================================================================
|
||||||
|
# UPDATE SCRIPT HELPER
|
||||||
|
# ==============================================================================
|
||||||
|
function ensure_update_script() {
|
||||||
|
[[ -f /usr/local/bin/update_portainer ]] && return 0
|
||||||
|
|
||||||
|
msg_info "Creating update script"
|
||||||
|
cat <<'UPDATEEOF' >/usr/local/bin/update_portainer
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# Portainer Update Script
|
||||||
|
type=update bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/portainer.sh)"
|
||||||
|
UPDATEEOF
|
||||||
|
chmod +x /usr/local/bin/update_portainer
|
||||||
|
msg_ok "Created update script (/usr/local/bin/update_portainer)"
|
||||||
|
}
|
||||||
|
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# UPDATE
|
# UPDATE
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
@@ -62,6 +78,8 @@ function update() {
|
|||||||
$STD docker compose up -d --remove-orphans
|
$STD docker compose up -d --remove-orphans
|
||||||
msg_ok "Restarted ${APP}"
|
msg_ok "Restarted ${APP}"
|
||||||
|
|
||||||
|
ensure_update_script
|
||||||
|
|
||||||
msg_ok "Updated successfully"
|
msg_ok "Updated successfully"
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
@@ -115,15 +133,7 @@ function install() {
|
|||||||
$STD docker compose up -d
|
$STD docker compose up -d
|
||||||
msg_ok "Started ${APP}"
|
msg_ok "Started ${APP}"
|
||||||
|
|
||||||
# Create update script
|
ensure_update_script
|
||||||
msg_info "Creating update script"
|
|
||||||
cat <<'UPDATEEOF' >/usr/local/bin/update_portainer
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Portainer Update Script
|
|
||||||
type=update bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/tools/addon/portainer.sh)"
|
|
||||||
UPDATEEOF
|
|
||||||
chmod +x /usr/local/bin/update_portainer
|
|
||||||
msg_ok "Created update script (/usr/local/bin/update_portainer)"
|
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
msg_ok "${APP} is reachable at: ${BL}https://${LOCAL_IP}:${DEFAULT_PORT}${CL}"
|
msg_ok "${APP} is reachable at: ${BL}https://${LOCAL_IP}:${DEFAULT_PORT}${CL}"
|
||||||
@@ -150,6 +160,9 @@ fi
|
|||||||
header_info
|
header_info
|
||||||
get_lxc_ip
|
get_lxc_ip
|
||||||
|
|
||||||
|
check_docker
|
||||||
|
check_existing_container
|
||||||
|
|
||||||
# Check if already installed
|
# Check if already installed
|
||||||
if [[ -f "$COMPOSE_FILE" ]]; then
|
if [[ -f "$COMPOSE_FILE" ]]; then
|
||||||
msg_warn "${APP} is already installed."
|
msg_warn "${APP} is already installed."
|
||||||
|
|||||||
@@ -54,18 +54,24 @@ while true; do
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Determine type and set config command
|
# Determine type and read the current config directly from Proxmox's pmxcfs.
|
||||||
if pct status $instance >/dev/null 2>&1; then
|
# Ignore snapshot sections, matching the current config shown by pct/qm config.
|
||||||
|
if [ -r "/etc/pve/lxc/$instance.conf" ]; then
|
||||||
type="ct"
|
type="ct"
|
||||||
config_cmd="pct config"
|
config_file="/etc/pve/lxc/$instance.conf"
|
||||||
else
|
else
|
||||||
type="vm"
|
type="vm"
|
||||||
config_cmd="qm config"
|
config_file="/etc/pve/qemu-server/$instance.conf"
|
||||||
fi
|
fi
|
||||||
|
config=$(sed '/^\[/,$d' "$config_file")
|
||||||
|
|
||||||
# Skip templates and onboot-disabled
|
# Skip templates and onboot-disabled
|
||||||
onboot=$($config_cmd $instance | grep -q "onboot: 0" || ( ! $config_cmd $instance | grep -q "onboot" ) && echo "true" || echo "false")
|
if grep -q "onboot: 0" <<<"$config" || ! grep -q "onboot" <<<"$config"; then
|
||||||
template=$($config_cmd $instance | grep -q "^template:" && echo "true" || echo "false")
|
onboot="true"
|
||||||
|
else
|
||||||
|
onboot="false"
|
||||||
|
fi
|
||||||
|
template=$(grep -q "^template:" <<<"$config" && echo "true" || echo "false")
|
||||||
|
|
||||||
if [ "$onboot" == "true" ]; then
|
if [ "$onboot" == "true" ]; then
|
||||||
echo "Skipping $instance because it is set not to boot"
|
echo "Skipping $instance because it is set not to boot"
|
||||||
@@ -76,7 +82,7 @@ while true; do
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Check for mon-restart tag
|
# Check for mon-restart tag
|
||||||
has_tag=$($config_cmd $instance | grep -q "tags:.*mon-restart" && echo "true" || echo "false")
|
has_tag=$(grep -q "tags:.*mon-restart" <<<"$config" && echo "true" || echo "false")
|
||||||
if [ "$has_tag" != "true" ]; then
|
if [ "$has_tag" != "true" ]; then
|
||||||
echo "Skipping $instance because it does not have 'mon-restart' tag"
|
echo "Skipping $instance because it does not have 'mon-restart' tag"
|
||||||
continue
|
continue
|
||||||
|
|||||||
+1
-1
@@ -402,7 +402,7 @@ function advanced_settings() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose CPU Model" --cancel-button Exit-Script 10 58 2 \
|
if CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose CPU Model" --cancel-button Exit-Script 10 58 2 \
|
||||||
"KVM64" "Default – safe for migration/compatibility" ON \
|
"KVM64" "Default - safe for migration/compatibility" ON \
|
||||||
"Host" "Use host CPU features (faster, no migration)" OFF \
|
"Host" "Use host CPU features (faster, no migration)" OFF \
|
||||||
3>&1 1>&2 2>&3); then
|
3>&1 1>&2 2>&3); then
|
||||||
case "$CPU_TYPE1" in
|
case "$CPU_TYPE1" in
|
||||||
|
|||||||
Reference in New Issue
Block a user