mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-08-17 18:16:12 +02:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b856fd7ae0 | |||
| 7a80b6c5b0 | |||
| 4f04894a19 | |||
| 05fdd15406 | |||
| 92ec089410 | |||
| abc9e569ad |
@@ -530,6 +530,8 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
- #### 🐞 Bug Fixes
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- [FIX] Shelfmark: internal bypasser never starts under the gevent worker [@robbiet480](https://github.com/robbiet480) ([#16495](https://github.com/community-scripts/ProxmoxVE/pull/16495))
|
||||||
|
- tubearchivist: fix: enhance update script [@CrazyWolf13](https://github.com/CrazyWolf13) ([#16521](https://github.com/community-scripts/ProxmoxVE/pull/16521))
|
||||||
- tracktor: build with pnpm using upstream's frozen lockfile [@MickLesk](https://github.com/MickLesk) ([#16530](https://github.com/community-scripts/ProxmoxVE/pull/16530))
|
- tracktor: build with pnpm using upstream's frozen lockfile [@MickLesk](https://github.com/MickLesk) ([#16530](https://github.com/community-scripts/ProxmoxVE/pull/16530))
|
||||||
- wallos: run db migration after apache reload on update [@MickLesk](https://github.com/MickLesk) ([#16528](https://github.com/community-scripts/ProxmoxVE/pull/16528))
|
- wallos: run db migration after apache reload on update [@MickLesk](https://github.com/MickLesk) ([#16528](https://github.com/community-scripts/ProxmoxVE/pull/16528))
|
||||||
|
|
||||||
|
|||||||
+9
-1
@@ -76,7 +76,15 @@ EOF
|
|||||||
|
|
||||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "PatchMon" "PatchMon/PatchMon" "singlefile" "latest" "/opt/patchmon" "patchmon-server-linux-$(arch_resolve)"
|
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "PatchMon" "PatchMon/PatchMon" "singlefile" "latest" "/opt/patchmon" "patchmon-server-linux-$(arch_resolve)"
|
||||||
mv /opt/patchmon/PatchMon /opt/patchmon/patchmon-server
|
mv /opt/patchmon/PatchMon /opt/patchmon/patchmon-server
|
||||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "ssg-content" "ComplianceAsCode/content" "prebuild" "latest" "/opt/patchmon/ssg-content" "scap-security-guide-*.tar.gz"
|
|
||||||
|
msg_info "Updating SCAP Content"
|
||||||
|
RELEASE=$(get_latest_github_release "ComplianceAsCode/content")
|
||||||
|
curl_with_retry "https://github.com/ComplianceAsCode/content/releases/download/v${RELEASE}/scap-security-guide-${RELEASE}.tar.gz" "/tmp/ssg.tar.gz"
|
||||||
|
mkdir -p /opt/patchmon/ssg-content
|
||||||
|
find /opt/patchmon/ssg-content -mindepth 1 -delete
|
||||||
|
tar -xzf /tmp/ssg.tar.gz -C /opt/patchmon/ssg-content --strip-components=1 --wildcards '*/ssg-*-ds.xml'
|
||||||
|
rm -f /tmp/ssg.tar.gz
|
||||||
|
msg_ok "Updated SCAP Content"
|
||||||
|
|
||||||
restore_backup
|
restore_backup
|
||||||
|
|
||||||
|
|||||||
+10
-2
@@ -36,9 +36,18 @@ function update_script() {
|
|||||||
if check_for_gh_release "shelfmark" "calibrain/shelfmark"; then
|
if check_for_gh_release "shelfmark" "calibrain/shelfmark"; then
|
||||||
msg_info "Stopping Service(s)"
|
msg_info "Stopping Service(s)"
|
||||||
systemctl stop shelfmark
|
systemctl stop shelfmark
|
||||||
[[ -f /etc/systemd/system/chromium.service ]] && systemctl stop chromium
|
|
||||||
msg_ok "Stopped Service(s)"
|
msg_ok "Stopped Service(s)"
|
||||||
|
|
||||||
|
if [[ $(sed -n '/_BYPASS=/s/[^=]*=//p' /etc/shelfmark/.env) == "true" ]] &&
|
||||||
|
[[ $(sed -n '/BYPASSER=/s/[^=]*=//p' /etc/shelfmark/.env) == "false" ]]; then
|
||||||
|
msg_info "Updating internal bypasser configuration"
|
||||||
|
systemctl disable -q --now chromium 2>/dev/null || true
|
||||||
|
rm -f /etc/systemd/system/chromium.service
|
||||||
|
systemctl daemon-reload
|
||||||
|
sed -i '/DOCKERMODE=/s/false/true/' /etc/shelfmark/.env
|
||||||
|
msg_ok "Updated internal bypasser configuration"
|
||||||
|
fi
|
||||||
|
|
||||||
[[ -f /etc/systemd/system/flaresolverr.service ]] && if check_for_gh_release "flaresolverr" "Flaresolverr/Flaresolverr"; then
|
[[ -f /etc/systemd/system/flaresolverr.service ]] && if check_for_gh_release "flaresolverr" "Flaresolverr/Flaresolverr"; then
|
||||||
msg_info "Stopping FlareSolverr service"
|
msg_info "Stopping FlareSolverr service"
|
||||||
systemctl stop flaresolverr
|
systemctl stop flaresolverr
|
||||||
@@ -79,7 +88,6 @@ function update_script() {
|
|||||||
|
|
||||||
msg_info "Starting Service(s)"
|
msg_info "Starting Service(s)"
|
||||||
systemctl start shelfmark
|
systemctl start shelfmark
|
||||||
[[ -f /etc/systemd/system/chromium.service ]] && systemctl start chromium
|
|
||||||
msg_ok "Started Service(s)"
|
msg_ok "Started Service(s)"
|
||||||
msg_ok "Updated successfully!"
|
msg_ok "Updated successfully!"
|
||||||
fi
|
fi
|
||||||
|
|||||||
+14
-3
@@ -35,7 +35,10 @@ function update_script() {
|
|||||||
systemctl stop tubearchivist tubearchivist-celery tubearchivist-beat
|
systemctl stop tubearchivist tubearchivist-celery tubearchivist-beat
|
||||||
msg_ok "Stopped Services"
|
msg_ok "Stopped Services"
|
||||||
|
|
||||||
create_backup /opt/tubearchivist/.env
|
create_backup \
|
||||||
|
/opt/tubearchivist/.env \
|
||||||
|
/opt/tubearchivist/cache \
|
||||||
|
/opt/tubearchivist/backend/run.sh
|
||||||
|
|
||||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "tubearchivist" "tubearchivist/tubearchivist" "tarball"
|
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "tubearchivist" "tubearchivist/tubearchivist" "tarball"
|
||||||
|
|
||||||
@@ -48,6 +51,8 @@ function update_script() {
|
|||||||
mkdir -p /opt/tubearchivist/backend/static
|
mkdir -p /opt/tubearchivist/backend/static
|
||||||
cp -r /opt/tubearchivist/frontend/dist/* /opt/tubearchivist/backend/static/
|
cp -r /opt/tubearchivist/frontend/dist/* /opt/tubearchivist/backend/static/
|
||||||
cp /opt/tubearchivist/docker_assets/backend_start.py /opt/tubearchivist/backend/
|
cp /opt/tubearchivist/docker_assets/backend_start.py /opt/tubearchivist/backend/
|
||||||
|
rm -rf /opt/tubearchivist/.venv
|
||||||
|
$STD uv venv /opt/tubearchivist/.venv --python 3.13
|
||||||
$STD uv pip install --python /opt/tubearchivist/.venv/bin/python -r /opt/tubearchivist/backend/requirements.txt
|
$STD uv pip install --python /opt/tubearchivist/.venv/bin/python -r /opt/tubearchivist/backend/requirements.txt
|
||||||
if [[ -f /opt/tubearchivist/backend/requirements.plugins.txt ]]; then
|
if [[ -f /opt/tubearchivist/backend/requirements.plugins.txt ]]; then
|
||||||
mkdir -p /opt/yt_plugins/bgutil
|
mkdir -p /opt/yt_plugins/bgutil
|
||||||
@@ -59,8 +64,14 @@ function update_script() {
|
|||||||
sed -i 's|^TA_APP_DIR=/opt/tubearchivist$|TA_APP_DIR=/opt/tubearchivist/backend|' /opt/tubearchivist/.env
|
sed -i 's|^TA_APP_DIR=/opt/tubearchivist$|TA_APP_DIR=/opt/tubearchivist/backend|' /opt/tubearchivist/.env
|
||||||
sed -i 's|^TA_CACHE_DIR=/opt/tubearchivist/cache$|TA_CACHE_DIR=/cache|' /opt/tubearchivist/.env
|
sed -i 's|^TA_CACHE_DIR=/opt/tubearchivist/cache$|TA_CACHE_DIR=/cache|' /opt/tubearchivist/.env
|
||||||
sed -i 's|^TA_MEDIA_DIR=/opt/tubearchivist/media$|TA_MEDIA_DIR=/youtube|' /opt/tubearchivist/.env
|
sed -i 's|^TA_MEDIA_DIR=/opt/tubearchivist/media$|TA_MEDIA_DIR=/youtube|' /opt/tubearchivist/.env
|
||||||
ln -sf /opt/tubearchivist/cache /cache
|
ln -sfn /opt/tubearchivist/cache /cache
|
||||||
ln -sf /opt/tubearchivist/media /youtube
|
# /youtube may already be a user-managed Proxmox bind mount. Only create the symlink if nothing is there
|
||||||
|
if [[ ! -e /youtube ]]; then
|
||||||
|
mkdir -p /opt/tubearchivist/media
|
||||||
|
ln -sfn /opt/tubearchivist/media /youtube
|
||||||
|
elif ! mountpoint -q /youtube && [[ ! -L /youtube ]]; then
|
||||||
|
msg_error "/youtube exists but is neither a mount nor a symlink - check manually"
|
||||||
|
fi
|
||||||
ln -sf /opt/tubearchivist/.env /opt/tubearchivist/backend/.env
|
ln -sf /opt/tubearchivist/.env /opt/tubearchivist/backend/.env
|
||||||
msg_ok "Restored Configuration"
|
msg_ok "Restored Configuration"
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,13 @@ for arch in "${AGENT_NAME[@]}"; do
|
|||||||
done
|
done
|
||||||
msg_ok "Fetched PatchMon agent binaries"
|
msg_ok "Fetched PatchMon agent binaries"
|
||||||
|
|
||||||
fetch_and_deploy_gh_release "ssg-content" "ComplianceAsCode/content" "prebuild" "latest" "/opt/patchmon/ssg-content" "scap-security-guide-*.tar.gz"
|
msg_info "Fetching SCAP Content"
|
||||||
|
RELEASE=$(get_latest_github_release "ComplianceAsCode/content")
|
||||||
|
curl_with_retry "https://github.com/ComplianceAsCode/content/releases/download/v${RELEASE}/scap-security-guide-${RELEASE}.tar.gz" "/tmp/ssg.tar.gz"
|
||||||
|
mkdir -p /opt/patchmon/ssg-content
|
||||||
|
tar -xzf /tmp/ssg.tar.gz -C /opt/patchmon/ssg-content --strip-components=1 --wildcards '*/ssg-*-ds.xml'
|
||||||
|
rm -f /tmp/ssg.tar.gz
|
||||||
|
msg_ok "Fetched SCAP Content"
|
||||||
|
|
||||||
msg_info "Creating service"
|
msg_info "Creating service"
|
||||||
cat <<EOF >/etc/systemd/system/patchmon-server.service
|
cat <<EOF >/etc/systemd/system/patchmon-server.service
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ else
|
|||||||
chromium-common \
|
chromium-common \
|
||||||
chromium \
|
chromium \
|
||||||
python3-tk
|
python3-tk
|
||||||
|
sed -i '/DOCKERMODE=/s/false/true/' /etc/shelfmark/.env
|
||||||
msg_ok "Installed internal bypasser dependencies"
|
msg_ok "Installed internal bypasser dependencies"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -165,22 +166,6 @@ KillMode=mixed
|
|||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if [[ "$DEPLOYMENT_TYPE" == "1" ]]; then
|
|
||||||
cat <<EOF >/etc/systemd/system/chromium.service
|
|
||||||
[Unit]
|
|
||||||
Description=Chromium Headless Browser
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
User=root
|
|
||||||
ExecStart=/usr/bin/chromium --headless --no-sandbox --disable-gpu --disable-dev-shm-usage --remote-debugging-address=127.0.0.1 --remote-debugging-port=9222 --hide-scrollbars
|
|
||||||
Restart=always
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
EOF
|
|
||||||
systemctl enable -q --now chromium
|
|
||||||
fi
|
|
||||||
if [[ "$DEPLOYMENT_TYPE" == "2" ]]; then
|
if [[ "$DEPLOYMENT_TYPE" == "2" ]]; then
|
||||||
cat <<EOF >/etc/systemd/system/flaresolverr.service
|
cat <<EOF >/etc/systemd/system/flaresolverr.service
|
||||||
[Unit]
|
[Unit]
|
||||||
|
|||||||
Reference in New Issue
Block a user