Compare commits

..

1 Commits

Author SHA1 Message Date
MickLesk 2fc9066a33 Refactor code structure for improved readability and maintainabilit 2026-06-17 14:15:59 +02:00
8 changed files with 62 additions and 126 deletions
-14
View File
@@ -491,24 +491,10 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
- kasm: fix release detection [@CrazyWolf13](https://github.com/CrazyWolf13) ([#15151](https://github.com/community-scripts/ProxmoxVE/pull/15151)) - kasm: fix release detection [@CrazyWolf13](https://github.com/CrazyWolf13) ([#15151](https://github.com/community-scripts/ProxmoxVE/pull/15151))
- #### ✨ New Features
- trek: update install and upgrade workflow for v3.1.0 [@MickLesk](https://github.com/MickLesk) ([#15165](https://github.com/community-scripts/ProxmoxVE/pull/15165))
- #### 💥 Breaking Changes - #### 💥 Breaking Changes
- TREK: Pin version [@tremor021](https://github.com/tremor021) ([#15156](https://github.com/community-scripts/ProxmoxVE/pull/15156)) - TREK: Pin version [@tremor021](https://github.com/tremor021) ([#15156](https://github.com/community-scripts/ProxmoxVE/pull/15156))
- #### 🔧 Refactor
- chore(paperless-ngx): pin version to prevent v3 update [@tomfrenzel](https://github.com/tomfrenzel) ([#15171](https://github.com/community-scripts/ProxmoxVE/pull/15171))
### 🧰 Tools
- #### 🐞 Bug Fixes
- immich public proxy: replace npm install with npm ci for consistent dependency installation [@MickLesk](https://github.com/MickLesk) ([#15166](https://github.com/community-scripts/ProxmoxVE/pull/15166))
## 2026-06-16 ## 2026-06-16
### 🆕 New Scripts ### 🆕 New Scripts
+3 -4
View File
@@ -49,8 +49,7 @@ function update_script() {
fi fi
fi fi
RELEASE="v2.20.15" if check_for_gh_release "paperless" "paperless-ngx/paperless-ngx"; then
if check_for_gh_release "paperless" "paperless-ngx/paperless-ngx" "${RELEASE}" "v3 needs further testing"; then
msg_info "Stopping all Paperless-ngx Services" msg_info "Stopping all Paperless-ngx Services"
systemctl stop paperless-consumer paperless-webserver paperless-scheduler paperless-task-queue systemctl stop paperless-consumer paperless-webserver paperless-scheduler paperless-task-queue
msg_ok "Stopped all Paperless-ngx Services" msg_ok "Stopped all Paperless-ngx Services"
@@ -64,7 +63,7 @@ function update_script() {
msg_ok "Backup completed to $BACKUP_DIR" msg_ok "Backup completed to $BACKUP_DIR"
PYTHON_VERSION="3.13" setup_uv PYTHON_VERSION="3.13" setup_uv
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "${RELEASE}" "/opt/paperless" "paperless*tar.xz" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc"
. /etc/os-release . /etc/os-release
@@ -139,7 +138,7 @@ function update_script() {
msg_ok "Backup completed to $BACKUP_DIR" msg_ok "Backup completed to $BACKUP_DIR"
PYTHON_VERSION="3.13" setup_uv PYTHON_VERSION="3.13" setup_uv
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "${RELEASE}" "/opt/paperless" "paperless*tar.xz" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc"
. /etc/os-release . /etc/os-release
+23 -56
View File
@@ -32,81 +32,48 @@ function update_script() {
NODE_VERSION="24" setup_nodejs NODE_VERSION="24" setup_nodejs
if check_for_gh_release "trek" "mauriceboe/TREK"; then if check_for_gh_release "trek" "mauriceboe/TREK" "v3.0.22"; then
MIGRATION=0
grep -qF "ExecStart=/usr/bin/node --import tsx src/index.ts" \
/etc/systemd/system/trek.service && MIGRATION=1
msg_info "Stopping Service" msg_info "Stopping Service"
systemctl stop trek systemctl stop trek
msg_ok "Stopped Service" msg_ok "Stopped Service"
ensure_dependencies "libkitinerary-bin" msg_info "Backing up Data"
cp /opt/trek/server/.env /opt/trek.env.bak
create_backup /opt/trek/server/.env \ mv /opt/trek/data /opt/trek-data.bak
/opt/trek/data \ mv /opt/trek/uploads /opt/trek-uploads.bak
/opt/trek/uploads msg_ok "Backed up Data"
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "trek" "mauriceboe/TREK" "tarball" CLEAN_INSTALL=1 fetch_and_deploy_gh_release "trek" "mauriceboe/TREK" "tarball"
msg_info "Building TREK" msg_info "Building Client"
cd /opt/trek cd /opt/trek/client
$STD npm ci $STD npm ci
$STD npm run build --workspace=shared $STD npm run build
$STD npm run build --workspace=client mkdir -p /opt/trek/server/public
$STD npm run build --workspace=server cp -r /opt/trek/client/dist/* /opt/trek/server/public/
msg_ok "Built TREK" cp -r /opt/trek/client/public/fonts /opt/trek/server/public/fonts 2>/dev/null || true
msg_ok "Built Client"
msg_info "Setting up TREK Workspace" msg_info "Installing Server Dependencies"
rm -rf /opt/trek/server/public cd /opt/trek/server
mkdir -p /opt/trek/server/public/fonts $STD npm ci
cp -a /opt/trek/client/dist/. /opt/trek/server/public/ msg_ok "Installed Server Dependencies"
cp -a /opt/trek/client/public/fonts/. /opt/trek/server/public/fonts/
restore_backup
msg_info "Restoring Data"
mv /opt/trek-data.bak /opt/trek/data
mv /opt/trek-uploads.bak /opt/trek/uploads
rm -rf /opt/trek/server/data /opt/trek/server/uploads rm -rf /opt/trek/server/data /opt/trek/server/uploads
ln -s /opt/trek/data /opt/trek/server/data ln -s /opt/trek/data /opt/trek/server/data
ln -s /opt/trek/uploads /opt/trek/server/uploads ln -s /opt/trek/uploads /opt/trek/server/uploads
cp /opt/trek.env.bak /opt/trek/server/.env
rm -rf /opt/trek/node_modules rm -f /opt/trek.env.bak
cd /opt/trek msg_ok "Restored Data"
$STD npm ci --workspace=server --omit=dev
msg_ok "Set up TREK Workspace"
if [[ "$MIGRATION" == "1" ]]; then
msg_info "Migrating TREK Service"
cat <<EOF >/etc/systemd/system/trek.service
[Unit]
Description=TREK Travel Planner
Documentation=https://github.com/mauriceboe/TREK
After=network-online.target
Wants=network-online.target
[Service]
Type=simple
User=root
WorkingDirectory=/opt/trek/server
EnvironmentFile=/opt/trek/server/.env
Environment=XDG_CACHE_HOME=/tmp/trek-kf6-cache
Environment=QT_QPA_PLATFORM=offscreen
ExecStart=/usr/bin/node --require tsconfig-paths/register dist/index.js
Restart=on-failure
RestartSec=5
[Install]
WantedBy=multi-user.target
EOF
systemctl daemon-reload
msg_ok "Migrated TREK Service"
fi
msg_info "Starting Service" msg_info "Starting Service"
systemctl start trek systemctl start trek
msg_ok "Started Service" msg_ok "Started Service"
msg_ok "Updated Successfully!" msg_ok "Updated Successfully!"
fi fi
exit exit
} }
+14
View File
@@ -16,6 +16,7 @@ var_arm64="${var_arm64:-no}"
var_unprivileged="${var_unprivileged:-0}" var_unprivileged="${var_unprivileged:-0}"
var_tun="${var_tun:-yes}" var_tun="${var_tun:-yes}"
var_nesting="${var_nesting:-1}" var_nesting="${var_nesting:-1}"
var_ns="${var_ns:-1.1.1.1 8.8.8.8}"
header_info "$APP" header_info "$APP"
variables variables
@@ -36,6 +37,19 @@ function update_script() {
start start
build_container build_container
HOOKSCRIPT_PATH="/var/lib/vz/snippets/unifi-os-server-multicast-${CTID}.sh"
cat >"$HOOKSCRIPT_PATH" <<EOF
#!/bin/sh
# Hookscript: enable multicast on the veth interface for UniFi OS Server LXC ${CTID}
# Required so the UniFi discovery client does not crash on startup inside the container.
if [ "\$1" = "${CTID}" ] && [ "\$2" = "post-start" ]; then
ip link set "veth${CTID}i0" multicast on 2>/dev/null || true
fi
EOF
chmod +x "$HOOKSCRIPT_PATH"
pct set "$CTID" --hookscript "local:snippets/unifi-os-server-multicast-${CTID}.sh"
description description
msg_ok "Completed successfully!\n" msg_ok "Completed successfully!\n"
+1 -6
View File
@@ -14,17 +14,12 @@ network_check
update_os update_os
msg_info "Installing Dependencies" msg_info "Installing Dependencies"
$STD apt install -y \ $STD apt install -y build-essential python3-dev
build-essential \
pkg-config
msg_ok "Installed Dependencies" msg_ok "Installed Dependencies"
PYTHON_VERSION="3.11" setup_uv
NODE_VERSION="24" setup_nodejs NODE_VERSION="24" setup_nodejs
msg_info "Installing FlowiseAI (Patience)" msg_info "Installing FlowiseAI (Patience)"
PYTHON_BIN="$(uv python find 3.11)"
export npm_config_python="$PYTHON_BIN"
$STD npm install -g flowise \ $STD npm install -g flowise \
@opentelemetry/exporter-trace-otlp-grpc \ @opentelemetry/exporter-trace-otlp-grpc \
@opentelemetry/exporter-trace-otlp-proto \ @opentelemetry/exporter-trace-otlp-proto \
+1 -1
View File
@@ -46,7 +46,7 @@ msg_ok "Installed Dependencies"
PG_VERSION="16" setup_postgresql PG_VERSION="16" setup_postgresql
PG_DB_NAME="paperlessdb" PG_DB_USER="paperless" setup_postgresql_db PG_DB_NAME="paperlessdb" PG_DB_USER="paperless" setup_postgresql_db
PYTHON_VERSION="3.13" setup_uv PYTHON_VERSION="3.13" setup_uv
fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "v2.20.15" "/opt/paperless" "paperless*tar.xz" fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
msg_info "Setup Paperless-ngx" msg_info "Setup Paperless-ngx"
cd /opt/paperless cd /opt/paperless
+18 -43
View File
@@ -14,82 +14,57 @@ network_check
update_os update_os
msg_info "Installing Dependencies" msg_info "Installing Dependencies"
$STD apt install -y \ $STD apt install -y build-essential
build-essential \
libkitinerary-bin
msg_ok "Installed Dependencies" msg_ok "Installed Dependencies"
NODE_VERSION="24" setup_nodejs NODE_VERSION="24" setup_nodejs
fetch_and_deploy_gh_release "trek" "mauriceboe/TREK" "tarball" fetch_and_deploy_gh_release "trek" "mauriceboe/TREK" "tarball" "v3.0.22"
msg_info "Setup TREK" msg_info "Building Client"
cd /opt/trek cd /opt/trek/client
$STD npm ci $STD npm ci
$STD npm run build --workspace=shared $STD npm run build
$STD npm run build --workspace=client msg_ok "Built Client"
$STD npm run build --workspace=server
msg_ok "Setup TREK"
msg_info "Setting up TREK Workspace" msg_info "Setting up Server"
rm -rf /opt/trek/server/public cd /opt/trek/server
$STD npm ci
mkdir -p /opt/trek/server/public mkdir -p /opt/trek/server/public
cp -a /opt/trek/client/dist/. /opt/trek/server/public/ cp -r /opt/trek/client/dist/* /opt/trek/server/public/
if [[ -d /opt/trek/client/public/fonts ]]; then cp -r /opt/trek/client/public/fonts /opt/trek/server/public/fonts 2>/dev/null || true
mkdir -p /opt/trek/server/public/fonts mkdir -p /opt/trek/{data/logs,uploads/{files,covers,avatars,photos}}
cp -a /opt/trek/client/public/fonts/. /opt/trek/server/public/fonts/ rm -rf /opt/trek/server/data /opt/trek/server/uploads
fi
mkdir -p \
/opt/trek/data/logs \
/opt/trek/uploads/files \
/opt/trek/uploads/covers \
/opt/trek/uploads/avatars \
/opt/trek/uploads/photos
rm -rf /opt/trek/server/data
rm -rf /opt/trek/server/uploads
ln -s /opt/trek/data /opt/trek/server/data ln -s /opt/trek/data /opt/trek/server/data
ln -s /opt/trek/uploads /opt/trek/server/uploads ln -s /opt/trek/uploads /opt/trek/server/uploads
cd /opt/trek
$STD npm prune --omit=dev
msg_ok "Set up TREK Workspace"
msg_info "Configuring TREK"
ENCRYPTION_KEY=$(openssl rand -hex 32) ENCRYPTION_KEY=$(openssl rand -hex 32)
ADMIN_EMAIL="admin@trek.local" ADMIN_EMAIL="admin@trek.local"
ADMIN_PASSWORD=$(openssl rand -base64 18 | tr -dc 'A-Za-z0-9' | head -c 16) ADMIN_PASSWORD=$(openssl rand -base64 18 | tr -dc 'A-Za-z0-9' | head -c 16)
cat <<EOF >/opt/trek/server/.env cat <<EOF >/opt/trek/server/.env
NODE_ENV=production NODE_ENV=production
HOST=0.0.0.0
PORT=3000 PORT=3000
ENCRYPTION_KEY=${ENCRYPTION_KEY} ENCRYPTION_KEY=${ENCRYPTION_KEY}
ADMIN_EMAIL=${ADMIN_EMAIL} ADMIN_EMAIL=${ADMIN_EMAIL}
ADMIN_PASSWORD=${ADMIN_PASSWORD} ADMIN_PASSWORD=${ADMIN_PASSWORD}
TZ=UTC
LOG_LEVEL=info
DEFAULT_LANGUAGE=en
ALLOWED_ORIGINS=
COOKIE_SECURE=false COOKIE_SECURE=false
FORCE_HTTPS=false FORCE_HTTPS=false
TRUST_PROXY=1 LOG_LEVEL=info
TZ=UTC
EOF EOF
chmod 600 /opt/trek/server/.env chmod 600 /opt/trek/server/.env
msg_ok "Configured TREK" msg_ok "Set up Server"
msg_info "Creating Service" msg_info "Creating Service"
cat <<EOF >/etc/systemd/system/trek.service cat <<EOF >/etc/systemd/system/trek.service
[Unit] [Unit]
Description=TREK Travel Planner Description=TREK Travel Planner
Documentation=https://github.com/mauriceboe/TREK After=network.target
After=network-online.target
Wants=network-online.target
[Service] [Service]
Type=simple Type=simple
User=root User=root
WorkingDirectory=/opt/trek/server WorkingDirectory=/opt/trek/server
EnvironmentFile=/opt/trek/server/.env EnvironmentFile=/opt/trek/server/.env
Environment=XDG_CACHE_HOME=/tmp/trek-kf6-cache ExecStart=/usr/bin/node --import tsx src/index.ts
Environment=QT_QPA_PLATFORM=offscreen
ExecStart=/usr/bin/node --require tsconfig-paths/register dist/index.js
Restart=on-failure Restart=on-failure
RestartSec=5 RestartSec=5
+2 -2
View File
@@ -99,7 +99,7 @@ function update() {
msg_info "Installing dependencies" msg_info "Installing dependencies"
cd "$CONFIG_PATH" cd "$CONFIG_PATH"
$STD npm ci $STD npm install
msg_ok "Installed dependencies" msg_ok "Installed dependencies"
msg_info "Building ${APP}" msg_info "Building ${APP}"
@@ -151,7 +151,7 @@ function install() {
msg_info "Installing dependencies" msg_info "Installing dependencies"
cd "$CONFIG_PATH" cd "$CONFIG_PATH"
$STD npm ci $STD npm install
msg_ok "Installed dependencies" msg_ok "Installed dependencies"
msg_info "Building ${APP}" msg_info "Building ${APP}"