mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-07-17 19:35:08 +02:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 07f8147568 |
-24
@@ -91,30 +91,6 @@ jobs:
|
||||
let skipped = 0;
|
||||
|
||||
for (const branch of candidates) {
|
||||
// A branch name can be reused after an earlier PR was merged. Never delete a
|
||||
// branch while it is the head of a current open PR, even if it is also a
|
||||
// candidate from an older merged PR.
|
||||
try {
|
||||
const { data: openPrs } = await github.rest.pulls.list({
|
||||
owner,
|
||||
repo,
|
||||
state: "open",
|
||||
head: `${owner}:${branch}`,
|
||||
per_page: 1,
|
||||
});
|
||||
|
||||
if (openPrs.length > 0) {
|
||||
console.log(`Skipped "${branch}" (head of open PR #${openPrs[0].number})`);
|
||||
skipped++;
|
||||
continue;
|
||||
}
|
||||
} catch (error) {
|
||||
// Do not risk deleting a branch if GitHub cannot confirm it has no open PR.
|
||||
console.log(`Failed to check open PRs for "${branch}": ${error.message}`);
|
||||
skipped++;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Confirm the branch still exists and isn't protected.
|
||||
let branchData;
|
||||
try {
|
||||
|
||||
@@ -506,26 +506,10 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- esphome: install libusb-1.0-0 for ESP-IDF native builds [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#15838](https://github.com/community-scripts/ProxmoxVE/pull/15838))
|
||||
|
||||
- #### ✨ New Features
|
||||
|
||||
- n8n: unpin / use latest release [@MickLesk](https://github.com/MickLesk) ([#15817](https://github.com/community-scripts/ProxmoxVE/pull/15817))
|
||||
- Pin Opencloud to v7.3.0 [@vhsdream](https://github.com/vhsdream) ([#15826](https://github.com/community-scripts/ProxmoxVE/pull/15826))
|
||||
|
||||
### 💾 Core
|
||||
|
||||
- #### ✨ New Features
|
||||
|
||||
- tools.func: enhance rbenv with profile updates / bundle in bashrc [@MickLesk](https://github.com/MickLesk) ([#15822](https://github.com/community-scripts/ProxmoxVE/pull/15822))
|
||||
- feat(build.func): notify users when already on a pinned script version [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#15819](https://github.com/community-scripts/ProxmoxVE/pull/15819))
|
||||
|
||||
- #### 💥 Breaking Changes
|
||||
|
||||
- MongoDB: Implement kernel version check and patch [@MickLesk](https://github.com/MickLesk) ([#15821](https://github.com/community-scripts/ProxmoxVE/pull/15821))
|
||||
|
||||
### 🧰 Tools
|
||||
|
||||
- #### ✨ New Features
|
||||
|
||||
+4
-7
@@ -30,19 +30,17 @@ function update_script() {
|
||||
exit
|
||||
fi
|
||||
|
||||
RELEASE="v0.27.0"
|
||||
RELEASE="v0.26.3"
|
||||
if check_for_gh_release "affine_app" "toeverything/AFFiNE" "${RELEASE}" "each release is tested individually before the version is updated. Please do not open issues for this"; then
|
||||
msg_info "Stopping Services"
|
||||
systemctl stop affine-web affine-worker
|
||||
msg_ok "Stopped Services"
|
||||
|
||||
ensure_dependencies cmake
|
||||
|
||||
create_backup /root/.affine/config /root/.affine/storage
|
||||
|
||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "affine_app" "toeverything/AFFiNE" "tarball" "${RELEASE}" "/opt/affine"
|
||||
|
||||
msg_info "Rebuilding Application (Patience ~25 mins, don't close the console!)"
|
||||
msg_info "Rebuilding Application (Patience)"
|
||||
cd /opt/affine
|
||||
source /root/.profile
|
||||
export PATH="/root/.cargo/bin:/root/.rbenv/shims:$PATH"
|
||||
@@ -53,12 +51,11 @@ function update_script() {
|
||||
export VITE_CORE_COMMIT_SHA=$(cat ~/.affine_app)
|
||||
|
||||
# Initialize git repo (required for build process)
|
||||
export HUSKY=0
|
||||
$STD git init -q
|
||||
$STD git config user.email "build@local"
|
||||
$STD git config user.name "Build"
|
||||
$STD git add -A
|
||||
$STD git commit -q -m "update" --no-verify --allow-empty
|
||||
$STD git commit -q -m "update"
|
||||
|
||||
# Force Turbo to run sequentially
|
||||
mkdir -p /opt/affine/.turbo
|
||||
@@ -69,7 +66,7 @@ function update_script() {
|
||||
TURBO
|
||||
|
||||
$STD corepack enable
|
||||
$STD corepack prepare yarn@4.13.0 --activate
|
||||
$STD corepack prepare yarn@4.12.0 --activate
|
||||
$STD yarn config set enableTelemetry 0
|
||||
|
||||
export NODE_OPTIONS="--max-old-space-size=2048"
|
||||
|
||||
@@ -28,7 +28,6 @@ function update_script() {
|
||||
msg_error "No ${APP} Installation Found!"
|
||||
exit
|
||||
fi
|
||||
ensure_dependencies libusb-1.0-0
|
||||
|
||||
msg_info "Stopping Service"
|
||||
systemctl stop esphome-device-builder 2>/dev/null || true
|
||||
|
||||
@@ -45,7 +45,7 @@ EOF
|
||||
systemctl daemon-reload
|
||||
fi
|
||||
|
||||
$STD npm install -g n8n@latest
|
||||
$STD npm install -g n8n@2.27.5
|
||||
systemctl restart n8n
|
||||
msg_ok "Updated n8n"
|
||||
msg_ok "Updated successfully!"
|
||||
|
||||
@@ -22,8 +22,7 @@ $STD apt install -y \
|
||||
libssl-dev \
|
||||
libjemalloc2 \
|
||||
redis-server \
|
||||
nginx \
|
||||
cmake
|
||||
nginx
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
PG_VERSION="16" PG_MODULES="pgvector" setup_postgresql
|
||||
@@ -31,7 +30,7 @@ PG_DB_NAME="affine" PG_DB_USER="affine" setup_postgresql_db
|
||||
NODE_VERSION="22" setup_nodejs
|
||||
setup_rust
|
||||
|
||||
fetch_and_deploy_gh_release "affine_app" "toeverything/AFFiNE" "tarball" "v0.27.0" "/opt/affine"
|
||||
fetch_and_deploy_gh_release "affine_app" "toeverything/AFFiNE" "tarball" "v0.26.3" "/opt/affine"
|
||||
|
||||
msg_info "Setting up Directories"
|
||||
rm -rf /root/.affine
|
||||
@@ -60,12 +59,11 @@ export PATH="/root/.cargo/bin:$PATH"
|
||||
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||
export VITE_CORE_COMMIT_SHA=$(cat ~/.affine_app)
|
||||
# # Initialize git repo (required for build process)
|
||||
export HUSKY=0
|
||||
$STD git init -q
|
||||
$STD git config user.email "build@local"
|
||||
$STD git config user.name "Build"
|
||||
$STD git add -A
|
||||
$STD git commit -q -m "update" --no-verify --allow-empty
|
||||
$STD git commit -q -m "initial"
|
||||
mkdir -p /opt/affine/.turbo
|
||||
cat <<TURBO >/opt/affine/.turbo/config.json
|
||||
{
|
||||
@@ -73,7 +71,7 @@ cat <<TURBO >/opt/affine/.turbo/config.json
|
||||
}
|
||||
TURBO
|
||||
$STD corepack enable
|
||||
$STD corepack prepare yarn@4.13.0 --activate
|
||||
$STD corepack prepare yarn@4.12.0 --activate
|
||||
$STD yarn config set enableTelemetry 0
|
||||
export NODE_OPTIONS="--max-old-space-size=4096"
|
||||
export TSC_COMPILE_ON_ERROR=true
|
||||
|
||||
@@ -14,8 +14,7 @@ network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt install -y git \
|
||||
libusb-1.0-0
|
||||
$STD apt install -y git
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
PYTHON_VERSION="3.12" setup_uv
|
||||
|
||||
@@ -16,6 +16,7 @@ update_os
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt install -y \
|
||||
build-essential \
|
||||
python3 \
|
||||
python3-setuptools \
|
||||
graphicsmagick
|
||||
msg_ok "Installed Dependencies"
|
||||
@@ -23,7 +24,7 @@ msg_ok "Installed Dependencies"
|
||||
NODE_VERSION="24" setup_nodejs
|
||||
|
||||
msg_info "Installing n8n (Patience)"
|
||||
$STD npm install -g n8n@latest
|
||||
$STD npm install -g n8n@2.27.5
|
||||
msg_ok "Installed n8n"
|
||||
|
||||
msg_info "Creating Service"
|
||||
|
||||
+142
-36
@@ -1009,6 +1009,7 @@ base_settings() {
|
||||
|
||||
APT_CACHER=${var_apt_cacher:-""}
|
||||
APT_CACHER_IP=${var_apt_cacher_ip:-""}
|
||||
INHERIT_HOST_CA="${var_inherit_host_ca:-auto}"
|
||||
|
||||
# Runtime check: Verify APT cacher is reachable if configured
|
||||
if [[ -n "$APT_CACHER_IP" && "$APT_CACHER" == "yes" ]]; then
|
||||
@@ -1088,7 +1089,7 @@ load_vars_file() {
|
||||
|
||||
# Allowed var_* keys
|
||||
local VAR_WHITELIST=(
|
||||
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu var_http_no_proxy var_http_proxy var_keyctl
|
||||
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu var_http_no_proxy var_http_proxy var_inherit_host_ca var_keyctl
|
||||
var_gateway var_hostname var_ipv6_method var_mac var_mknod var_mount_fs var_mtu
|
||||
var_net var_nesting var_ns var_os var_protection var_pw var_ram var_tags var_timezone var_tun var_unprivileged
|
||||
var_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage var_searchdomain
|
||||
@@ -1285,6 +1286,12 @@ load_vars_file() {
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
var_inherit_host_ca)
|
||||
if [[ "$var_val" != "yes" && "$var_val" != "no" && "$var_val" != "auto" ]]; then
|
||||
msg_warn "Invalid host CA inheritance value '$var_val' in $file (must be yes/no/auto), ignoring"
|
||||
continue
|
||||
fi
|
||||
;;
|
||||
var_container_storage | var_template_storage)
|
||||
# Validate that the storage exists and is active on the current node
|
||||
local _storage_status
|
||||
@@ -1324,7 +1331,7 @@ default_var_settings() {
|
||||
# Allowed var_* keys (alphabetically sorted)
|
||||
# Note: Removed var_ctid (can only exist once), var_ipv6_static (static IPs are unique)
|
||||
local VAR_WHITELIST=(
|
||||
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu var_http_no_proxy var_http_proxy var_keyctl
|
||||
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu var_http_no_proxy var_http_proxy var_inherit_host_ca var_keyctl
|
||||
var_gateway var_hostname var_ipv6_method var_mac var_mknod var_mount_fs var_mtu
|
||||
var_net var_nesting var_ns var_os var_protection var_pw var_ram var_tags var_timezone var_tun var_unprivileged
|
||||
var_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage
|
||||
@@ -1407,6 +1414,7 @@ var_ssh=no
|
||||
# HTTP/HTTPS proxy (optional - for networks requiring a proxy)
|
||||
# var_http_proxy=http://proxy.local:8080
|
||||
# var_http_no_proxy=localhost,127.0.0.1,.local
|
||||
# var_inherit_host_ca=auto
|
||||
|
||||
# Features/Tags/verbosity
|
||||
var_fuse=no
|
||||
@@ -1507,7 +1515,7 @@ get_app_defaults_path() {
|
||||
if ! declare -p VAR_WHITELIST >/dev/null 2>&1; then
|
||||
# Note: Removed var_ctid (can only exist once), var_ipv6_static (static IPs are unique)
|
||||
declare -ag VAR_WHITELIST=(
|
||||
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu var_http_no_proxy var_http_proxy var_keyctl
|
||||
var_apt_cacher var_apt_cacher_ip var_brg var_cpu var_disk var_fuse var_github_token var_gpu var_http_no_proxy var_http_proxy var_inherit_host_ca var_keyctl
|
||||
var_gateway var_hostname var_ipv6_method var_mac var_mknod var_mount_fs var_mtu
|
||||
var_net var_nesting var_ns var_os var_protection var_pw var_ram var_tags var_timezone var_tun var_unprivileged
|
||||
var_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage var_searchdomain
|
||||
@@ -1657,6 +1665,7 @@ _build_current_app_vars_tmp() {
|
||||
_apt_cacher_ip="${APT_CACHER_IP:-}"
|
||||
_http_proxy="${HTTP_PROXY:-${var_http_proxy:-}}"
|
||||
_http_no_proxy="${HTTP_NO_PROXY:-${var_http_no_proxy:-}}"
|
||||
_inherit_host_ca="${INHERIT_HOST_CA:-${var_inherit_host_ca:-auto}}"
|
||||
_fuse="${ENABLE_FUSE:-no}"
|
||||
_tun="${ENABLE_TUN:-no}"
|
||||
_gpu="${ENABLE_GPU:-no}"
|
||||
@@ -1710,6 +1719,7 @@ _build_current_app_vars_tmp() {
|
||||
[ -n "$_apt_cacher_ip" ] && echo "var_apt_cacher_ip=$(_sanitize_value "$_apt_cacher_ip")"
|
||||
[ -n "$_http_proxy" ] && echo "var_http_proxy=$(_sanitize_value "$_http_proxy")"
|
||||
[ -n "$_http_no_proxy" ] && echo "var_http_no_proxy=$(_sanitize_value "$_http_no_proxy")"
|
||||
[ -n "$_inherit_host_ca" ] && echo "var_inherit_host_ca=$(_sanitize_value "$_inherit_host_ca")"
|
||||
|
||||
[ -n "$_fuse" ] && echo "var_fuse=$(_sanitize_value "$_fuse")"
|
||||
[ -n "$_tun" ] && echo "var_tun=$(_sanitize_value "$_tun")"
|
||||
@@ -1874,7 +1884,7 @@ advanced_settings() {
|
||||
TAGS="community-script${var_tags:+;${var_tags}}"
|
||||
fi
|
||||
local STEP=1
|
||||
local MAX_STEP=30
|
||||
local MAX_STEP=31
|
||||
|
||||
# Store values for back navigation - inherit from var_* app defaults
|
||||
local _ct_type="${var_unprivileged:-1}"
|
||||
@@ -1896,6 +1906,7 @@ advanced_settings() {
|
||||
local _apt_cacher_ip="${var_apt_cacher_ip:-}"
|
||||
local _http_proxy="${var_http_proxy:-}"
|
||||
local _http_no_proxy="${var_http_no_proxy:-}"
|
||||
local _inherit_host_ca="${var_inherit_host_ca:-auto}"
|
||||
local _mtu="${var_mtu:-}"
|
||||
local _sd="${var_searchdomain:-}"
|
||||
local _ns="${var_ns:-}"
|
||||
@@ -2725,9 +2736,47 @@ advanced_settings() {
|
||||
;;
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════════════════
|
||||
# STEP 25: Container Timezone
|
||||
# STEP 25: Host CA Inheritance
|
||||
# ═══════════════════════════════════════════════════════════════════════════
|
||||
25)
|
||||
local host_ca_count=0
|
||||
local host_ca_dir="/usr/local/share/ca-certificates"
|
||||
local cert
|
||||
shopt -s nullglob
|
||||
for cert in "$host_ca_dir"/*.crt; do
|
||||
host_ca_count=$((host_ca_count + 1))
|
||||
done
|
||||
shopt -u nullglob
|
||||
|
||||
if [[ $host_ca_count -eq 0 ]]; then
|
||||
_inherit_host_ca="auto"
|
||||
((STEP++))
|
||||
continue
|
||||
fi
|
||||
|
||||
local host_ca_default_flag=""
|
||||
[[ "$_inherit_host_ca" == "no" ]] && host_ca_default_flag="--defaultno"
|
||||
if whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
|
||||
--title "HOST CA INHERITANCE" \
|
||||
--ok-button "Next" --cancel-button "Back" \
|
||||
$host_ca_default_flag \
|
||||
--yesno "\nInherit host CA certificates into this container?\n\nDetected on host: ${host_ca_count} certificate(s) in:\n${host_ca_dir}\n\nRecommended for private PKI / TLS-inspection environments.\n\n(App default: ${var_inherit_host_ca:-auto})" 16 72; then
|
||||
_inherit_host_ca="yes"
|
||||
else
|
||||
if [ $? -eq 1 ]; then
|
||||
_inherit_host_ca="no"
|
||||
else
|
||||
((STEP--))
|
||||
continue
|
||||
fi
|
||||
fi
|
||||
((STEP++))
|
||||
;;
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════════════════
|
||||
# STEP 26: Container Timezone
|
||||
# ═══════════════════════════════════════════════════════════════════════════
|
||||
26)
|
||||
local tz_hint="$_ct_timezone"
|
||||
[[ -z "$tz_hint" ]] && tz_hint="(empty - will use host timezone)"
|
||||
|
||||
@@ -2750,9 +2799,9 @@ advanced_settings() {
|
||||
;;
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════════════════
|
||||
# STEP 26: Container Protection
|
||||
# STEP 27: Container Protection
|
||||
# ═══════════════════════════════════════════════════════════════════════════
|
||||
26)
|
||||
27)
|
||||
local protect_default_flag="--defaultno"
|
||||
[[ "$_protect_ct" == "yes" || "$_protect_ct" == "1" ]] && protect_default_flag=""
|
||||
|
||||
@@ -2904,6 +2953,7 @@ Leave empty to skip."
|
||||
local apt_display="${_apt_cacher:-no}"
|
||||
[[ "$_apt_cacher" == "yes" && -n "$_apt_cacher_ip" ]] && apt_display="$_apt_cacher_ip"
|
||||
local http_proxy_display="${_http_proxy:-(none)}"
|
||||
local inherit_ca_display="${_inherit_host_ca:-auto}"
|
||||
|
||||
local post_install_display="${_post_install:-(none)}"
|
||||
local post_install_warn=""
|
||||
@@ -2934,6 +2984,7 @@ Advanced:
|
||||
Timezone: $tz_display
|
||||
APT Cacher: $apt_display
|
||||
HTTP Proxy: $http_proxy_display
|
||||
Inherit Host CAs: $inherit_ca_display
|
||||
Verbose: $_verbose
|
||||
Post-Install Script: ${post_install_display}${post_install_warn}"
|
||||
|
||||
@@ -2979,6 +3030,7 @@ Advanced:
|
||||
APT_CACHER_IP="$_apt_cacher_ip"
|
||||
HTTP_PROXY="$_http_proxy"
|
||||
HTTP_NO_PROXY="$_http_no_proxy"
|
||||
INHERIT_HOST_CA="$_inherit_host_ca"
|
||||
VERBOSE="$_verbose"
|
||||
var_post_install="$_post_install"
|
||||
|
||||
@@ -2997,6 +3049,7 @@ Advanced:
|
||||
var_sdn_vnet="$_sdn_vnet"
|
||||
var_http_proxy="$_http_proxy"
|
||||
var_http_no_proxy="$_http_no_proxy"
|
||||
var_inherit_host_ca="$_inherit_host_ca"
|
||||
|
||||
# Format optional values
|
||||
[[ -n "$_mtu" ]] && MTU=",mtu=$_mtu" || MTU=""
|
||||
@@ -3753,19 +3806,18 @@ run_addon_updates() {
|
||||
}
|
||||
|
||||
runtime_script_status_guard() {
|
||||
local mode="${1:-}"
|
||||
local script_slug="${SCRIPT_SLUG:-${NSAPP:-}}"
|
||||
script_slug="$(echo "$script_slug" | tr '[:upper:]' '[:lower:]' | tr ' ' '-')"
|
||||
[[ -z "$script_slug" ]] && return 0
|
||||
|
||||
local api_url="https://db.community-scripts.org/api/collections/script_scripts/records?filter=(slug='${script_slug}')&perPage=1&fields=slug,is_disabled,is_deleted,disable_message,deleted_message,pinned_version,pin_reason"
|
||||
local api_url="https://db.community-scripts.org/api/collections/script_scripts/records?filter=(slug='${script_slug}')&perPage=1&fields=slug,is_disabled,is_deleted,disable_message,deleted_message"
|
||||
local response
|
||||
if ! response=$(curl -fsSL --connect-timeout 2 --max-time 3 "$api_url" 2>/dev/null); then
|
||||
msg_warn "Script status check is unavailable. Continuing without status verification."
|
||||
return 0
|
||||
fi
|
||||
|
||||
local is_deleted is_disabled deleted_message disable_message pinned_version pin_reason info_url
|
||||
local is_deleted is_disabled deleted_message disable_message info_url
|
||||
if printf '%s' "$response" | grep -qE '"items":[[:space:]]*\[[[:space:]]*\]'; then
|
||||
return 0
|
||||
fi
|
||||
@@ -3775,8 +3827,6 @@ runtime_script_status_guard() {
|
||||
is_disabled=$(printf '%s' "$response" | sed -n 's/.*"is_disabled"[[:space:]]*:[[:space:]]*\(true\|false\).*/\1/p' | head -1)
|
||||
deleted_message=$(printf '%s' "$response" | sed -n 's/.*"deleted_message"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -1)
|
||||
disable_message=$(printf '%s' "$response" | sed -n 's/.*"disable_message"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -1)
|
||||
pinned_version=$(printf '%s' "$response" | sed -n 's/.*"pinned_version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -1)
|
||||
pin_reason=$(printf '%s' "$response" | sed -n 's/.*"pin_reason"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' | head -1)
|
||||
is_deleted=${is_deleted:-false}
|
||||
is_disabled=${is_disabled:-false}
|
||||
info_url="https://community-scripts.org/scripts/${script_slug}"
|
||||
@@ -3808,26 +3858,6 @@ runtime_script_status_guard() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ "$mode" == "update" && -n "$pinned_version" && -n "${NSAPP:-}" ]]; then
|
||||
local current_file="$HOME/.${NSAPP}"
|
||||
if [[ -f "$current_file" ]]; then
|
||||
local installed pinned_clean installed_clean
|
||||
installed="$(<"$current_file")"
|
||||
pinned_clean="$pinned_version"
|
||||
installed_clean="$installed"
|
||||
[[ "$pinned_clean" =~ ^v[0-9] ]] && pinned_clean="${pinned_clean:1}"
|
||||
[[ "$installed_clean" =~ ^v[0-9] ]] && installed_clean="${installed_clean:1}"
|
||||
if [[ "$installed_clean" == "$pinned_clean" ]]; then
|
||||
if [[ -n "$pin_reason" ]]; then
|
||||
msg_info "You are already on the pinned version (${pinned_version}). ${pin_reason}"
|
||||
else
|
||||
msg_info "You are already on the pinned version (${pinned_version}). No newer update is offered intentionally — please do not open an issue unless you see an actual error."
|
||||
fi
|
||||
msg_info "More info: ${info_url}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -3843,7 +3873,7 @@ runtime_script_status_guard() {
|
||||
start() {
|
||||
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/tools.func)
|
||||
if command -v pveversion >/dev/null 2>&1; then
|
||||
runtime_script_status_guard install || return 0
|
||||
runtime_script_status_guard || return 0
|
||||
install_script || return 0
|
||||
return 0
|
||||
elif [ ! -z ${PHS_SILENT+x} ] && [[ "${PHS_SILENT}" == "1" ]]; then
|
||||
@@ -3851,7 +3881,7 @@ start() {
|
||||
set_std_mode
|
||||
ensure_profile_loaded
|
||||
get_lxc_ip
|
||||
runtime_script_status_guard update || return 0
|
||||
runtime_script_status_guard || return 0
|
||||
update_script
|
||||
run_addon_updates
|
||||
update_motd_ip
|
||||
@@ -3862,7 +3892,7 @@ start() {
|
||||
set_std_mode
|
||||
ensure_profile_loaded
|
||||
get_lxc_ip
|
||||
runtime_script_status_guard update || return 0
|
||||
runtime_script_status_guard || return 0
|
||||
update_script
|
||||
run_addon_updates
|
||||
update_motd_ip
|
||||
@@ -3892,7 +3922,7 @@ start() {
|
||||
esac
|
||||
ensure_profile_loaded
|
||||
get_lxc_ip
|
||||
runtime_script_status_guard update || return 0
|
||||
runtime_script_status_guard || return 0
|
||||
update_script
|
||||
run_addon_updates
|
||||
update_motd_ip
|
||||
@@ -3945,6 +3975,81 @@ EOF
|
||||
msg_ok "Applied HTTP proxy in container"
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# _apply_host_ca_certs_in_container()
|
||||
#
|
||||
# - Copies administrator-provided CA certificates from the Proxmox host into the
|
||||
# container before base package bootstrap
|
||||
# - Source: /usr/local/share/ca-certificates/*.crt (Debian convention)
|
||||
# - Refreshes the container trust store when update-ca-certificates is available
|
||||
# - No-op when no host certificates are present; failures are non-fatal
|
||||
# ------------------------------------------------------------------------------
|
||||
_apply_host_ca_certs_in_container() {
|
||||
local host_ca_dir="/usr/local/share/ca-certificates"
|
||||
[[ -z "${CTID:-}" ]] && return 0
|
||||
local inherit_host_ca="${INHERIT_HOST_CA:-${var_inherit_host_ca:-auto}}"
|
||||
|
||||
local -a host_certs=()
|
||||
local cert
|
||||
shopt -s nullglob
|
||||
for cert in "$host_ca_dir"/*.crt; do
|
||||
host_certs+=("$cert")
|
||||
done
|
||||
shopt -u nullglob
|
||||
|
||||
[[ ${#host_certs[@]} -eq 0 ]] && return 0
|
||||
|
||||
case "${inherit_host_ca,,}" in
|
||||
no | false | 0 | off)
|
||||
msg_info "Skipping host CA inheritance by configuration"
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
|
||||
msg_info "Inheriting host CA certificates into container"
|
||||
|
||||
local found=${#host_certs[@]}
|
||||
local copied=0
|
||||
local skipped=0
|
||||
local cert_name
|
||||
|
||||
pct exec "$CTID" -- mkdir -p /usr/local/share/ca-certificates >/dev/null 2>&1 || {
|
||||
msg_warn "Failed to create CA certificate directory in container"
|
||||
return 0
|
||||
}
|
||||
|
||||
for cert in "${host_certs[@]}"; do
|
||||
cert_name="$(basename "$cert")"
|
||||
if [[ ! -r "$cert" || "$cert_name" != *.crt ]]; then
|
||||
msg_warn "Skipping invalid or unreadable host CA certificate: ${cert_name}"
|
||||
skipped=$((skipped + 1))
|
||||
continue
|
||||
fi
|
||||
|
||||
if pct push "$CTID" "$cert" "/usr/local/share/ca-certificates/${cert_name}" >/dev/null 2>&1; then
|
||||
pct exec "$CTID" -- chmod 644 "/usr/local/share/ca-certificates/${cert_name}" >/dev/null 2>&1 || true
|
||||
copied=$((copied + 1))
|
||||
else
|
||||
msg_warn "Failed to push host CA certificate: ${cert_name}"
|
||||
skipped=$((skipped + 1))
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ $copied -eq 0 ]]; then
|
||||
msg_warn "No host CA certificates were copied (${found} found, ${skipped} skipped)"
|
||||
return 0
|
||||
fi
|
||||
|
||||
local refresh_shell="bash"
|
||||
[[ "$var_os" == "alpine" ]] && refresh_shell="ash"
|
||||
|
||||
if pct exec "$CTID" -- "$refresh_shell" -c 'command -v update-ca-certificates >/dev/null 2>&1 && update-ca-certificates' >/dev/null 2>&1; then
|
||||
msg_ok "Inherited ${copied} host CA certificate(s) and updated trust store (${skipped} skipped)"
|
||||
else
|
||||
msg_warn "Copied ${copied} host CA certificate(s), but trust store update failed or update-ca-certificates is unavailable (${skipped} skipped)"
|
||||
fi
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# build_container()
|
||||
#
|
||||
@@ -4565,6 +4670,7 @@ EOF
|
||||
local install_exit_code=0
|
||||
|
||||
_apply_http_proxy_in_container
|
||||
_apply_host_ca_certs_in_container
|
||||
|
||||
# Continue with standard container setup
|
||||
if [ "$var_os" == "alpine" ]; then
|
||||
|
||||
@@ -7431,18 +7431,6 @@ setup_mongodb() {
|
||||
mkdir -p /var/lib/mongodb
|
||||
chown -R mongodb:mongodb /var/lib/mongodb
|
||||
|
||||
local KERNEL_VERSION MONGO_MAJOR
|
||||
KERNEL_VERSION=$(uname -r | cut -d- -f1)
|
||||
MONGO_MAJOR="${MONGO_VERSION%%.*}"
|
||||
if ((MONGO_MAJOR >= 8)) && [[ "$(printf '%s\n' "6.19" "$KERNEL_VERSION" | sort -V | head -n1)" == "6.19" ]]; then
|
||||
mkdir -p /etc/systemd/system/mongod.service.d
|
||||
cat <<EOF >/etc/systemd/system/mongod.service.d/rseq.conf
|
||||
[Service]
|
||||
Environment=GLIBC_TUNABLES=glibc.pthread.rseq=1
|
||||
EOF
|
||||
systemctl daemon-reload
|
||||
fi
|
||||
|
||||
$STD systemctl enable mongod || {
|
||||
msg_warn "Failed to enable mongod service"
|
||||
}
|
||||
@@ -8689,7 +8677,6 @@ setup_postgresql_db() {
|
||||
export PG_DB_USER
|
||||
export PG_DB_PASS
|
||||
}
|
||||
|
||||
# ------------------------------------------------------------------------------
|
||||
# Installs rbenv and ruby-build, installs Ruby and optionally Rails.
|
||||
#
|
||||
@@ -8709,26 +8696,8 @@ setup_ruby() {
|
||||
local RBENV_DIR="$HOME/.rbenv"
|
||||
local RBENV_BIN="$RBENV_DIR/bin/rbenv"
|
||||
local PROFILE_FILE="$HOME/.profile"
|
||||
local BASH_PROFILE_FILE="$HOME/.bash_profile"
|
||||
local BASHRC_FILE="$HOME/.bashrc"
|
||||
local TMP_DIR=$(mktemp -d)
|
||||
|
||||
if ! grep -q 'rbenv init' "$PROFILE_FILE" 2>/dev/null; then
|
||||
cat <<'EOF' >>"$PROFILE_FILE"
|
||||
export PATH="$HOME/.rbenv/bin:$PATH"
|
||||
eval "$(rbenv init -)"
|
||||
EOF
|
||||
fi
|
||||
if ! grep -q '.rbenv/shims' "$PROFILE_FILE" 2>/dev/null; then
|
||||
echo 'export PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH"' >>"$PROFILE_FILE"
|
||||
fi
|
||||
if [[ -f "$BASH_PROFILE_FILE" ]] && ! grep -q '.rbenv/shims' "$BASH_PROFILE_FILE"; then
|
||||
echo 'export PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH"' >>"$BASH_PROFILE_FILE"
|
||||
fi
|
||||
if [[ -f "$BASHRC_FILE" ]] && ! grep -q '.rbenv/shims' "$BASHRC_FILE"; then
|
||||
echo 'export PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH"' >>"$BASHRC_FILE"
|
||||
fi
|
||||
|
||||
# Get currently installed Ruby version
|
||||
local CURRENT_RUBY_VERSION=""
|
||||
if [[ -x "$RBENV_BIN" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user