Compare commits
9 Commits
8373469647
...
3051842f3f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3051842f3f | ||
|
|
6ee5c9eab4 | ||
|
|
bd38e7bdf4 | ||
|
|
78c8933855 | ||
|
|
c16e187f36 | ||
|
|
ac89626832 | ||
|
|
72ecf11324 | ||
|
|
98f2bd9783 | ||
|
|
ca2c708ad6 |
@@ -14,10 +14,18 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- post-pve/post-pbs: Disable 'pve-enterprise' and 'ceph enterprise' repositories [@MickLesk](https://github.com/MickLesk) ([#8399](https://github.com/community-scripts/ProxmoxVE/pull/8399))
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- fix: changedetection: fix for tsc and esbuild not found [@CrazyWolf13](https://github.com/CrazyWolf13) ([#8407](https://github.com/community-scripts/ProxmoxVE/pull/8407))
|
||||
- paperless-ngx: remove unneeded deps, use static ghostscript [@MickLesk](https://github.com/MickLesk) ([#8397](https://github.com/community-scripts/ProxmoxVE/pull/8397))
|
||||
- UmlautAdaptarr: Revert back to bookworm repo [@tremor021](https://github.com/tremor021) ([#8392](https://github.com/community-scripts/ProxmoxVE/pull/8392))
|
||||
|
||||
- #### 🔧 Refactor
|
||||
|
||||
- Enhance nginx proxy manager install script [@MickLesk](https://github.com/MickLesk) ([#8400](https://github.com/community-scripts/ProxmoxVE/pull/8400))
|
||||
|
||||
## 2025-10-15
|
||||
|
||||
### 🆕 New Scripts
|
||||
|
||||
@@ -57,6 +57,7 @@ function update_script() {
|
||||
$STD /opt/browserless/node_modules/playwright-core/cli.js install --force chrome
|
||||
$STD /opt/browserless/node_modules/playwright-core/cli.js install --force msedge
|
||||
$STD /opt/browserless/node_modules/playwright-core/cli.js install chromium firefox webkit
|
||||
$STD npm install --prefix /opt/browserless esbuild typescript ts-node @types/node
|
||||
$STD npm run build --prefix /opt/browserless
|
||||
$STD npm run build:function --prefix /opt/browserless
|
||||
$STD npm prune production --prefix /opt/browserless
|
||||
|
||||
@@ -13,6 +13,8 @@ setting_up_container
|
||||
network_check
|
||||
update_os
|
||||
|
||||
setup_go
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt update
|
||||
$STD apt -y install \
|
||||
@@ -33,48 +35,38 @@ $STD apt install -y \
|
||||
python3-certbot \
|
||||
python3-certbot-dns-cloudflare
|
||||
$STD pip3 install --break-system-packages certbot-dns-multi
|
||||
$STD python3 -m venv /opt/certbot/
|
||||
msg_ok "Installed Python Dependencies"
|
||||
|
||||
VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
|
||||
|
||||
msg_info "Installing Openresty"
|
||||
curl -fsSL "https://openresty.org/package/pubkey.gpg" | gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg
|
||||
echo -e "deb http://openresty.org/package/debian bullseye openresty" >/etc/apt/sources.list.d/openresty.list
|
||||
case "$VERSION" in
|
||||
trixie)
|
||||
echo -e "deb http://openresty.org/package/debian bookworm openresty" >/etc/apt/sources.list.d/openresty.list
|
||||
;;
|
||||
*)
|
||||
echo -e "deb http://openresty.org/package/debian $VERSION openresty" >/etc/apt/sources.list.d/openresty.list
|
||||
;;
|
||||
esac
|
||||
$STD apt update
|
||||
$STD apt -y install openresty
|
||||
msg_ok "Installed Openresty"
|
||||
|
||||
msg_info "Installing Node.js"
|
||||
$STD bash <(curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh)
|
||||
source ~/.bashrc
|
||||
$STD nvm install 16.20.2
|
||||
ln -sf /root/.nvm/versions/node/v16.20.2/bin/node /usr/bin/node
|
||||
msg_ok "Installed Node.js"
|
||||
|
||||
msg_info "Installing pnpm"
|
||||
$STD npm install -g pnpm@8.15
|
||||
msg_ok "Installed pnpm"
|
||||
NODE_VERSION="22" NODE_MODULE="pnpm@latest" setup_nodejs
|
||||
|
||||
RELEASE=$(curl -fsSL https://api.github.com/repos/NginxProxyManager/nginx-proxy-manager/releases/latest |
|
||||
grep "tag_name" |
|
||||
awk '{print substr($2, 3, length($2)-4) }')
|
||||
|
||||
read -r -p "${TAB3}Would you like to install an older version (v2.10.4)? <y/N> " prompt
|
||||
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
|
||||
msg_info "Downloading Nginx Proxy Manager v2.10.4"
|
||||
curl -fsSL "https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.10.4" | tar -xz
|
||||
cd ./nginx-proxy-manager-2.10.4
|
||||
msg_ok "Downloaded Nginx Proxy Manager v2.10.4"
|
||||
else
|
||||
msg_info "Downloading Nginx Proxy Manager v${RELEASE}"
|
||||
curl -fsSL "https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE}" | tar -xz
|
||||
cd ./nginx-proxy-manager-"${RELEASE}"
|
||||
msg_ok "Downloaded Nginx Proxy Manager v${RELEASE}"
|
||||
fi
|
||||
msg_info "Downloading Nginx Proxy Manager v${RELEASE}"
|
||||
curl -fsSL "https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v${RELEASE}" | tar -xz
|
||||
cd ./nginx-proxy-manager-"${RELEASE}"
|
||||
msg_ok "Downloaded Nginx Proxy Manager v${RELEASE}"
|
||||
|
||||
msg_info "Setting up Environment"
|
||||
ln -sf /usr/bin/python3 /usr/bin/python
|
||||
ln -sf /usr/bin/certbot /opt/certbot/bin/certbot
|
||||
ln -sf /usr/bin/certbot /usr/local/bin/certbot
|
||||
ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx
|
||||
ln -sf /usr/local/openresty/nginx/ /etc/nginx
|
||||
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
|
||||
@@ -185,7 +177,6 @@ customize
|
||||
msg_info "Starting Services"
|
||||
sed -i 's/user npm/user root/g; s/^pid/#pid/g' /usr/local/openresty/nginx/conf/nginx.conf
|
||||
sed -r -i 's/^([[:space:]]*)su npm npm/\1#su npm npm/g;' /etc/logrotate.d/nginx-proxy-manager
|
||||
sed -i 's/include-system-site-packages = false/include-system-site-packages = true/g' /opt/certbot/pyvenv.cfg
|
||||
systemctl enable -q --now openresty
|
||||
systemctl enable -q --now npm
|
||||
msg_ok "Started Services"
|
||||
|
||||
@@ -110,7 +110,11 @@ $STD uv run python -m nltk.downloader -d /usr/share/nltk_data snowball_data
|
||||
$STD uv run python -m nltk.downloader -d /usr/share/nltk_data stopwords
|
||||
$STD uv run python -m nltk.downloader -d /usr/share/nltk_data punkt_tab || \
|
||||
$STD uv run python -m nltk.downloader -d /usr/share/nltk_data punkt
|
||||
sed -i -e 's/rights="none" pattern="PDF"/rights="read|write" pattern="PDF"/' /etc/ImageMagick-6/policy.xml
|
||||
for policy_file in /etc/ImageMagick-6/policy.xml /etc/ImageMagick-7/policy.xml; do
|
||||
if [[ -f "$policy_file" ]]; then
|
||||
sed -i -e 's/rights="none" pattern="PDF"/rights="read|write" pattern="PDF"/' "$policy_file"
|
||||
fi
|
||||
done
|
||||
msg_ok "Installed Natural Language Toolkit"
|
||||
|
||||
msg_info "Creating Services"
|
||||
|
||||
@@ -14,9 +14,9 @@ network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Proxmox Backup Server"
|
||||
curl -fsSL "https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg" -o "/etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg"
|
||||
curl -fsSL "https://enterprise.proxmox.com/debian/proxmox-release-trixie.gpg" -o "/etc/apt/trusted.gpg.d/proxmox-release-trixie.gpg"
|
||||
cat <<EOF >>/etc/apt/sources.list
|
||||
deb http://download.proxmox.com/debian/pbs bookworm pbs-no-subscription
|
||||
deb http://download.proxmox.com/debian/pbs trixie pbs-no-subscription
|
||||
EOF
|
||||
$STD apt update
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
@@ -204,7 +204,13 @@ You normally need a valid subscription for this.
|
||||
Disable it (recommended)?" 14 58 2 "yes" " " "no" " " 3>&2 2>&1 1>&3)
|
||||
case $CHOICE in
|
||||
yes)
|
||||
sed -i '/pbs-enterprise/ s/^/# /' /etc/apt/sources.list.d/pbs-enterprise.sources
|
||||
msg_info "Disabling 'pbs-enterprise' repository"
|
||||
# Use Enabled: false instead of commenting to avoid malformed entry
|
||||
if grep -q "^Enabled:" /etc/apt/sources.list.d/pbs-enterprise.sources 2>/dev/null; then
|
||||
sed -i 's/^Enabled:.*/Enabled: false/' /etc/apt/sources.list.d/pbs-enterprise.sources
|
||||
else
|
||||
echo "Enabled: false" >>/etc/apt/sources.list.d/pbs-enterprise.sources
|
||||
fi
|
||||
msg_ok "Disabled 'pbs-enterprise' repository"
|
||||
;;
|
||||
no)
|
||||
@@ -213,11 +219,12 @@ Disable it (recommended)?" 14 58 2 "yes" " " "no" " " 3>&2 2>&1 1>&3)
|
||||
esac
|
||||
else
|
||||
cat >/etc/apt/sources.list.d/pbs-enterprise.sources <<EOF
|
||||
# Types: deb
|
||||
# URIs: https://enterprise.proxmox.com/debian/pbs
|
||||
# Suites: trixie
|
||||
# Components: pbs-enterprise
|
||||
# Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
Types: deb
|
||||
URIs: https://enterprise.proxmox.com/debian/pbs
|
||||
Suites: trixie
|
||||
Components: pbs-enterprise
|
||||
Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
Enabled: false
|
||||
EOF
|
||||
msg_ok "Added 'pbs-enterprise' repository (disabled)"
|
||||
fi
|
||||
@@ -239,11 +246,12 @@ EOF
|
||||
# --- Test repo (pbs-test, renamed) ---
|
||||
if ! component_exists_in_sources "pbs-test"; then
|
||||
cat >/etc/apt/sources.list.d/pbs-test.sources <<EOF
|
||||
# Types: deb
|
||||
# URIs: http://download.proxmox.com/debian/pbs
|
||||
# Suites: trixie
|
||||
# Components: pbs-test
|
||||
# Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
Types: deb
|
||||
URIs: http://download.proxmox.com/debian/pbs
|
||||
Suites: trixie
|
||||
Components: pbs-test
|
||||
Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
Enabled: false
|
||||
EOF
|
||||
msg_ok "Added 'pbs-test' repository (disabled)"
|
||||
else
|
||||
|
||||
@@ -197,7 +197,7 @@ start_routines_9() {
|
||||
|
||||
# Check sources.list
|
||||
if [[ -f "$listfile" ]] && grep -qE '^\s*deb ' "$listfile"; then
|
||||
(( ++LEGACY_COUNT ))
|
||||
((++LEGACY_COUNT))
|
||||
fi
|
||||
|
||||
# Check .list files
|
||||
@@ -289,11 +289,15 @@ EOF
|
||||
msg_ok "Kept 'pve-enterprise' repository"
|
||||
;;
|
||||
disable)
|
||||
msg_info "Disabling (commenting) 'pve-enterprise' repository"
|
||||
# Comment out every non-comment line in the file that has 'pve-enterprise' in Components
|
||||
msg_info "Disabling 'pve-enterprise' repository"
|
||||
# Use Enabled: false instead of commenting to avoid malformed entry
|
||||
for file in /etc/apt/sources.list.d/*.sources; do
|
||||
if grep -q "Components:.*pve-enterprise" "$file"; then
|
||||
sed -i '/^\s*Types:/,/^$/s/^\([^#].*\)$/# \1/' "$file"
|
||||
if grep -q "^Enabled:" "$file"; then
|
||||
sed -i 's/^Enabled:.*/Enabled: false/' "$file"
|
||||
else
|
||||
echo "Enabled: false" >>"$file"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
msg_ok "Disabled 'pve-enterprise' repository"
|
||||
@@ -346,10 +350,15 @@ EOF
|
||||
msg_ok "Kept 'ceph enterprise' repository"
|
||||
;;
|
||||
disable)
|
||||
msg_info "Disabling (commenting) 'ceph enterprise' repository"
|
||||
msg_info "Disabling 'ceph enterprise' repository"
|
||||
# Use Enabled: false instead of commenting to avoid malformed entry
|
||||
for file in /etc/apt/sources.list.d/*.sources; do
|
||||
if grep -q "enterprise.proxmox.com.*ceph" "$file"; then
|
||||
sed -i '/^\s*Types:/,/^$/s/^\([^#].*\)$/# \1/' "$file"
|
||||
if grep -q "^Enabled:" "$file"; then
|
||||
sed -i 's/^Enabled:.*/Enabled: false/' "$file"
|
||||
else
|
||||
echo "Enabled: false" >>"$file"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
msg_ok "Disabled 'ceph enterprise' repository"
|
||||
@@ -472,7 +481,17 @@ EOF
|
||||
;;
|
||||
no)
|
||||
msg_error "Selected no to Adding 'ceph package repositories'"
|
||||
find /etc/apt/sources.list.d/ -type f \( -name "*.sources" -o -name "*.list" \) \
|
||||
# Use Enabled: false for .sources files, comment for .list files
|
||||
for file in /etc/apt/sources.list.d/*.sources; do
|
||||
if grep -q "enterprise.proxmox.com.*ceph" "$file" 2>/dev/null; then
|
||||
if grep -q "^Enabled:" "$file"; then
|
||||
sed -i 's/^Enabled:.*/Enabled: false/' "$file"
|
||||
else
|
||||
echo "Enabled: false" >>"$file"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
find /etc/apt/sources.list.d/ -type f -name "*.list" \
|
||||
-exec sed -i '/enterprise.proxmox.com.*ceph/s/^/# /' {} \;
|
||||
msg_ok "Disabled all Ceph Enterprise repositories"
|
||||
;;
|
||||
@@ -491,11 +510,12 @@ EOF
|
||||
yes)
|
||||
msg_info "Adding 'pve-test' repository (deb822, disabled)"
|
||||
cat >/etc/apt/sources.list.d/pve-test.sources <<EOF
|
||||
# Types: deb
|
||||
# URIs: http://download.proxmox.com/debian/pve
|
||||
# Suites: trixie
|
||||
# Components: pve-test
|
||||
# Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
Types: deb
|
||||
URIs: http://download.proxmox.com/debian/pve
|
||||
Suites: trixie
|
||||
Components: pve-test
|
||||
Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
|
||||
Enabled: false
|
||||
EOF
|
||||
msg_ok "Added 'pve-test' repository"
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user