mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-06-24 16:24:57 +02:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ad94016835 | |||
| f9abae77a4 | |||
| 8cbdd0ac4d |
@@ -486,50 +486,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
## 2026-06-24
|
|
||||||
|
|
||||||
### 🚀 Updated Scripts
|
|
||||||
|
|
||||||
- enabling rewirte module in apache [@d3v3lop3rDE](https://github.com/d3v3lop3rDE) ([#15360](https://github.com/community-scripts/ProxmoxVE/pull/15360))
|
|
||||||
|
|
||||||
### 💾 Core
|
|
||||||
|
|
||||||
- #### ✨ New Features
|
|
||||||
|
|
||||||
- core: add var_http_proxy and var_http_no_proxy support [@MickLesk](https://github.com/MickLesk) ([#15225](https://github.com/community-scripts/ProxmoxVE/pull/15225))
|
|
||||||
|
|
||||||
## 2026-06-23
|
|
||||||
|
|
||||||
### 🚀 Updated Scripts
|
|
||||||
|
|
||||||
- #### 🐞 Bug Fixes
|
|
||||||
|
|
||||||
- update jdk when updating crafty-controller [@asylumexp](https://github.com/asylumexp) ([#15349](https://github.com/community-scripts/ProxmoxVE/pull/15349))
|
|
||||||
- fix docker update function [@asylumexp](https://github.com/asylumexp) ([#15353](https://github.com/community-scripts/ProxmoxVE/pull/15353))
|
|
||||||
- LibreNMS: run daily.sh as librenms user with git available [@MickLesk](https://github.com/MickLesk) ([#15314](https://github.com/community-scripts/ProxmoxVE/pull/15314))
|
|
||||||
|
|
||||||
- #### ✨ New Features
|
|
||||||
|
|
||||||
- termix - patch tmp nginx behaviour to match the install script [@xyzulu](https://github.com/xyzulu) ([#15283](https://github.com/community-scripts/ProxmoxVE/pull/15283))
|
|
||||||
|
|
||||||
### 💾 Core
|
|
||||||
|
|
||||||
- Fix syntax error in build function [@l0caldadmin](https://github.com/l0caldadmin) ([#15337](https://github.com/community-scripts/ProxmoxVE/pull/15337))
|
|
||||||
|
|
||||||
- #### 🐞 Bug Fixes
|
|
||||||
|
|
||||||
- fix: close lxc build function [@ServerBP](https://github.com/ServerBP) ([#15343](https://github.com/community-scripts/ProxmoxVE/pull/15343))
|
|
||||||
|
|
||||||
### 🧰 Tools
|
|
||||||
|
|
||||||
- #### ✨ New Features
|
|
||||||
|
|
||||||
- [arm64] port pve scripts to support arm64 [@asylumexp](https://github.com/asylumexp) ([#15288](https://github.com/community-scripts/ProxmoxVE/pull/15288))
|
|
||||||
|
|
||||||
### ❔ Uncategorized
|
|
||||||
|
|
||||||
- fix(build.func): remove duplicate if statement causing syntax error on container creation [@Copilot](https://github.com/Copilot) ([#15338](https://github.com/community-scripts/ProxmoxVE/pull/15338))
|
|
||||||
|
|
||||||
## 2026-06-22
|
## 2026-06-22
|
||||||
|
|
||||||
### 🆕 New Scripts
|
### 🆕 New Scripts
|
||||||
|
|||||||
@@ -46,12 +46,6 @@ function update_script() {
|
|||||||
|
|
||||||
restore_backup
|
restore_backup
|
||||||
|
|
||||||
msg_info "Updating TemurinJDK"
|
|
||||||
setup_java
|
|
||||||
$STD apt install -y temurin-{8,11,17,21,25}-jre
|
|
||||||
$STD update-alternatives --set java /usr/lib/jvm/temurin-25-jre-$(arch_resolve)/bin/java
|
|
||||||
msg_ok "Updated TemurinJDK"
|
|
||||||
|
|
||||||
msg_info "Updating Python dependencies"
|
msg_info "Updating Python dependencies"
|
||||||
chown -R crafty:crafty /opt/crafty-controller
|
chown -R crafty:crafty /opt/crafty-controller
|
||||||
cd /opt/crafty-controller/crafty/crafty-4
|
cd /opt/crafty-controller/crafty/crafty-4
|
||||||
|
|||||||
+4
-6
@@ -27,14 +27,12 @@ function update_script() {
|
|||||||
|
|
||||||
msg_info "Updating base system"
|
msg_info "Updating base system"
|
||||||
$STD apt update
|
$STD apt update
|
||||||
$STD apt upgrade -y
|
$STD apt upgrade -y
|
||||||
msg_ok "Base system updated"
|
msg_ok "Base system updated"
|
||||||
|
|
||||||
if dpkg-query -W -f='${Status}' docker-ce 2>/dev/null | grep -q "ok installed"; then
|
msg_info "Updating Docker Engine"
|
||||||
USE_DOCKER_REPO="true" setup_docker
|
$STD apt install --only-upgrade -y docker-ce docker-ce-cli containerd.io docker-compose-plugin docker-buildx-plugin
|
||||||
else
|
msg_ok "Docker Engine updated"
|
||||||
setup_docker
|
|
||||||
fi
|
|
||||||
|
|
||||||
if docker ps -a --format '{{.Image}}' | grep -q '^portainer/portainer-ce:latest$'; then
|
if docker ps -a --format '{{.Image}}' | grep -q '^portainer/portainer-ce:latest$'; then
|
||||||
msg_info "Updating Portainer"
|
msg_info "Updating Portainer"
|
||||||
|
|||||||
+3
-14
@@ -29,21 +29,10 @@ function update_script() {
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
setup_mariadb
|
setup_mariadb
|
||||||
ensure_dependencies git
|
|
||||||
if [[ ! -d /opt/librenms/.git ]]; then
|
|
||||||
msg_info "Initializing LibreNMS git metadata"
|
|
||||||
LIBRENMS_VERSION=$(cat ~/.librenms 2>/dev/null)
|
|
||||||
cd /opt/librenms
|
|
||||||
git init -q
|
|
||||||
git remote add origin https://github.com/librenms/librenms.git
|
|
||||||
git fetch --depth 1 origin "refs/tags/v${LIBRENMS_VERSION}" 2>/dev/null ||
|
|
||||||
git fetch --depth 1 origin "refs/tags/${LIBRENMS_VERSION}" 2>/dev/null || true
|
|
||||||
git checkout -qf FETCH_HEAD 2>/dev/null || true
|
|
||||||
chown -R librenms:librenms .git
|
|
||||||
msg_ok "Initialized LibreNMS git metadata"
|
|
||||||
fi
|
|
||||||
msg_info "Updating LibreNMS"
|
msg_info "Updating LibreNMS"
|
||||||
$STD su - librenms -s /bin/bash -c 'cd /opt/librenms && ./daily.sh'
|
su librenms
|
||||||
|
cd /opt/librenms
|
||||||
|
./daily.sh
|
||||||
msg_ok "Updated LibreNMS"
|
msg_ok "Updated LibreNMS"
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-17
@@ -206,25 +206,9 @@ EOF
|
|||||||
sed -i 's|/app/html|/opt/termix/html|g' /etc/nginx/nginx.conf
|
sed -i 's|/app/html|/opt/termix/html|g' /etc/nginx/nginx.conf
|
||||||
sed -i 's|/app/nginx|/opt/termix/nginx|g' /etc/nginx/nginx.conf
|
sed -i 's|/app/nginx|/opt/termix/nginx|g' /etc/nginx/nginx.conf
|
||||||
sed -i 's|listen ${PORT};|listen 80;|g' /etc/nginx/nginx.conf
|
sed -i 's|listen ${PORT};|listen 80;|g' /etc/nginx/nginx.conf
|
||||||
|
|
||||||
rm -f /etc/systemd/system/nginx.service.d/pidfile.conf
|
rm -f /etc/systemd/system/nginx.service.d/pidfile.conf
|
||||||
rm -f /etc/tmpfiles.d/nginx-termix.conf
|
rm -f /etc/tmpfiles.d/nginx-termix.conf
|
||||||
|
|
||||||
if [ ! -d /tmp/nginx ]; then
|
|
||||||
mkdir -p /tmp/nginx
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f /etc/tmpfiles.d/nginx-termix.conf ]; then
|
|
||||||
echo "d /tmp/nginx 0755 nobody nogroup -" >/etc/tmpfiles.d/nginx-termix.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f /etc/systemd/system/nginx.service.d/pidfile.conf ]; then
|
|
||||||
mkdir -p /etc/systemd/system/nginx.service.d/
|
|
||||||
cat <<'EOF' >/etc/systemd/system/nginx.service.d/pidfile.conf
|
|
||||||
[Service]
|
|
||||||
PIDFile=/tmp/nginx/nginx.pid
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
nginx -t && systemctl restart nginx
|
nginx -t && systemctl restart nginx
|
||||||
msg_ok "Updated Nginx Configuration"
|
msg_ok "Updated Nginx Configuration"
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
|
|||||||
$STD apt install -y \
|
$STD apt install -y \
|
||||||
acl \
|
acl \
|
||||||
fping \
|
fping \
|
||||||
git \
|
|
||||||
graphviz \
|
graphviz \
|
||||||
imagemagick \
|
imagemagick \
|
||||||
mtr-tiny \
|
mtr-tiny \
|
||||||
@@ -65,16 +64,6 @@ EOF
|
|||||||
chown -R librenms:librenms /opt/librenms
|
chown -R librenms:librenms /opt/librenms
|
||||||
chmod 771 /opt/librenms
|
chmod 771 /opt/librenms
|
||||||
chmod -R ug=rwX /opt/librenms/bootstrap/cache /opt/librenms/storage /opt/librenms/logs /opt/librenms/rrd
|
chmod -R ug=rwX /opt/librenms/bootstrap/cache /opt/librenms/storage /opt/librenms/logs /opt/librenms/rrd
|
||||||
if [[ ! -d /opt/librenms/.git ]]; then
|
|
||||||
LIBRENMS_VERSION=$(cat ~/.librenms 2>/dev/null)
|
|
||||||
cd /opt/librenms
|
|
||||||
git init -q
|
|
||||||
git remote add origin https://github.com/librenms/librenms.git
|
|
||||||
git fetch --depth 1 origin "refs/tags/v${LIBRENMS_VERSION}" 2>/dev/null ||
|
|
||||||
git fetch --depth 1 origin "refs/tags/${LIBRENMS_VERSION}" 2>/dev/null || true
|
|
||||||
git checkout -qf FETCH_HEAD 2>/dev/null || true
|
|
||||||
chown -R librenms:librenms .git
|
|
||||||
fi
|
|
||||||
msg_ok "Configured LibreNMS"
|
msg_ok "Configured LibreNMS"
|
||||||
|
|
||||||
msg_info "Configure MariaDB"
|
msg_info "Configure MariaDB"
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ cat <<EOF >/etc/apache2/sites-available/wordpress.conf
|
|||||||
EOF
|
EOF
|
||||||
$STD a2ensite wordpress.conf
|
$STD a2ensite wordpress.conf
|
||||||
$STD a2dissite 000-default.conf
|
$STD a2dissite 000-default.conf
|
||||||
$STD a2enmod rewrite
|
|
||||||
systemctl reload apache2
|
systemctl reload apache2
|
||||||
msg_ok "Created Services"
|
msg_ok "Created Services"
|
||||||
|
|
||||||
|
|||||||
@@ -138,7 +138,6 @@ network_check() {
|
|||||||
# This function updates the Container OS by running apk upgrade with mirror fallback
|
# This function updates the Container OS by running apk upgrade with mirror fallback
|
||||||
update_os() {
|
update_os() {
|
||||||
msg_info "Updating Container OS"
|
msg_info "Updating Container OS"
|
||||||
configure_http_proxy
|
|
||||||
if ! $STD apk -U upgrade; then
|
if ! $STD apk -U upgrade; then
|
||||||
msg_warn "apk update failed (dl-cdn.alpinelinux.org), trying alternate mirrors..."
|
msg_warn "apk update failed (dl-cdn.alpinelinux.org), trying alternate mirrors..."
|
||||||
local alpine_mirrors="mirror.init7.net ftp.halifax.rwth-aachen.de mirrors.edge.kernel.org alpine.mirror.wearetriple.com mirror.leaseweb.com uk.alpinelinux.org dl-2.alpinelinux.org dl-4.alpinelinux.org"
|
local alpine_mirrors="mirror.init7.net ftp.halifax.rwth-aachen.de mirrors.edge.kernel.org alpine.mirror.wearetriple.com mirror.leaseweb.com uk.alpinelinux.org dl-2.alpinelinux.org dl-4.alpinelinux.org"
|
||||||
@@ -244,7 +243,7 @@ EOF
|
|||||||
msg_ok "Customized Container"
|
msg_ok "Customized Container"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo 'set -a; [ -f /etc/profile.d/90-http-proxy.sh ] && . /etc/profile.d/90-http-proxy.sh; set +a; bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/'"${app}"'.sh)"' >/usr/bin/update
|
echo "bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/${app}.sh)\"" >/usr/bin/update
|
||||||
chmod +x /usr/bin/update
|
chmod +x /usr/bin/update
|
||||||
post_progress_to_api
|
post_progress_to_api
|
||||||
}
|
}
|
||||||
|
|||||||
+18
-141
@@ -1018,9 +1018,6 @@ base_settings() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
HTTP_PROXY="${var_http_proxy:-}"
|
|
||||||
HTTP_NO_PROXY="${var_http_no_proxy:-}"
|
|
||||||
|
|
||||||
MTU=${var_mtu:-""}
|
MTU=${var_mtu:-""}
|
||||||
_sd_val="${var_searchdomain:-""}"
|
_sd_val="${var_searchdomain:-""}"
|
||||||
[[ -n "$_sd_val" ]] && SD="-searchdomain=$_sd_val" || SD=""
|
[[ -n "$_sd_val" ]] && SD="-searchdomain=$_sd_val" || SD=""
|
||||||
@@ -1074,7 +1071,7 @@ load_vars_file() {
|
|||||||
|
|
||||||
# Allowed var_* keys
|
# Allowed var_* keys
|
||||||
local VAR_WHITELIST=(
|
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_keyctl
|
||||||
var_gateway var_hostname var_ipv6_method var_mac var_mknod var_mount_fs var_mtu
|
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_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
|
var_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage var_searchdomain
|
||||||
@@ -1253,18 +1250,6 @@ load_vars_file() {
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
var_http_proxy)
|
|
||||||
if [[ -n "$var_val" ]] && ! [[ "$var_val" =~ ^https?://[^[:space:]]+(:[0-9]+)?/?$ ]]; then
|
|
||||||
msg_warn "Invalid HTTP proxy URL '$var_val' in $file, ignoring"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
var_http_no_proxy)
|
|
||||||
if [[ -n "$var_val" ]] && [[ ! "$var_val" =~ ^[a-zA-Z0-9.*_:/-]+(,[a-zA-Z0-9.*_:/-]+)*$ ]]; then
|
|
||||||
msg_warn "Invalid no_proxy value '$var_val' in $file, ignoring"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
var_container_storage | var_template_storage)
|
var_container_storage | var_template_storage)
|
||||||
# Validate that the storage exists and is active on the current node
|
# Validate that the storage exists and is active on the current node
|
||||||
local _storage_status
|
local _storage_status
|
||||||
@@ -1304,7 +1289,7 @@ default_var_settings() {
|
|||||||
# Allowed var_* keys (alphabetically sorted)
|
# Allowed var_* keys (alphabetically sorted)
|
||||||
# Note: Removed var_ctid (can only exist once), var_ipv6_static (static IPs are unique)
|
# Note: Removed var_ctid (can only exist once), var_ipv6_static (static IPs are unique)
|
||||||
local VAR_WHITELIST=(
|
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_keyctl
|
||||||
var_gateway var_hostname var_ipv6_method var_mac var_mknod var_mount_fs var_mtu
|
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_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_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage
|
||||||
@@ -1384,10 +1369,6 @@ var_ssh=no
|
|||||||
# var_apt_cacher_ip=http://proxy.local
|
# var_apt_cacher_ip=http://proxy.local
|
||||||
# var_apt_cacher_ip=https://proxy.local:443
|
# var_apt_cacher_ip=https://proxy.local:443
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
# Features/Tags/verbosity
|
# Features/Tags/verbosity
|
||||||
var_fuse=no
|
var_fuse=no
|
||||||
var_tun=no
|
var_tun=no
|
||||||
@@ -1487,7 +1468,7 @@ get_app_defaults_path() {
|
|||||||
if ! declare -p VAR_WHITELIST >/dev/null 2>&1; then
|
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)
|
# Note: Removed var_ctid (can only exist once), var_ipv6_static (static IPs are unique)
|
||||||
declare -ag VAR_WHITELIST=(
|
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_keyctl
|
||||||
var_gateway var_hostname var_ipv6_method var_mac var_mknod var_mount_fs var_mtu
|
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_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
|
var_verbose var_version var_vlan var_ssh var_ssh_authorized_key var_container_storage var_template_storage var_searchdomain
|
||||||
@@ -1635,8 +1616,6 @@ _build_current_app_vars_tmp() {
|
|||||||
_ssh_auth="${SSH_AUTHORIZED_KEY:-}"
|
_ssh_auth="${SSH_AUTHORIZED_KEY:-}"
|
||||||
_apt_cacher="${APT_CACHER:-}"
|
_apt_cacher="${APT_CACHER:-}"
|
||||||
_apt_cacher_ip="${APT_CACHER_IP:-}"
|
_apt_cacher_ip="${APT_CACHER_IP:-}"
|
||||||
_http_proxy="${HTTP_PROXY:-${var_http_proxy:-}}"
|
|
||||||
_http_no_proxy="${HTTP_NO_PROXY:-${var_http_no_proxy:-}}"
|
|
||||||
_fuse="${ENABLE_FUSE:-no}"
|
_fuse="${ENABLE_FUSE:-no}"
|
||||||
_tun="${ENABLE_TUN:-no}"
|
_tun="${ENABLE_TUN:-no}"
|
||||||
_gpu="${ENABLE_GPU:-no}"
|
_gpu="${ENABLE_GPU:-no}"
|
||||||
@@ -1688,8 +1667,6 @@ _build_current_app_vars_tmp() {
|
|||||||
|
|
||||||
[ -n "$_apt_cacher" ] && echo "var_apt_cacher=$(_sanitize_value "$_apt_cacher")"
|
[ -n "$_apt_cacher" ] && echo "var_apt_cacher=$(_sanitize_value "$_apt_cacher")"
|
||||||
[ -n "$_apt_cacher_ip" ] && echo "var_apt_cacher_ip=$(_sanitize_value "$_apt_cacher_ip")"
|
[ -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 "$_fuse" ] && echo "var_fuse=$(_sanitize_value "$_fuse")"
|
[ -n "$_fuse" ] && echo "var_fuse=$(_sanitize_value "$_fuse")"
|
||||||
[ -n "$_tun" ] && echo "var_tun=$(_sanitize_value "$_tun")"
|
[ -n "$_tun" ] && echo "var_tun=$(_sanitize_value "$_tun")"
|
||||||
@@ -1853,7 +1830,7 @@ advanced_settings() {
|
|||||||
TAGS="community-script${var_tags:+;${var_tags}}"
|
TAGS="community-script${var_tags:+;${var_tags}}"
|
||||||
fi
|
fi
|
||||||
local STEP=1
|
local STEP=1
|
||||||
local MAX_STEP=30
|
local MAX_STEP=29
|
||||||
|
|
||||||
# Store values for back navigation - inherit from var_* app defaults
|
# Store values for back navigation - inherit from var_* app defaults
|
||||||
local _ct_type="${var_unprivileged:-1}"
|
local _ct_type="${var_unprivileged:-1}"
|
||||||
@@ -1872,8 +1849,6 @@ advanced_settings() {
|
|||||||
local _ipv6_gate=""
|
local _ipv6_gate=""
|
||||||
local _apt_cacher="${var_apt_cacher:-no}"
|
local _apt_cacher="${var_apt_cacher:-no}"
|
||||||
local _apt_cacher_ip="${var_apt_cacher_ip:-}"
|
local _apt_cacher_ip="${var_apt_cacher_ip:-}"
|
||||||
local _http_proxy="${var_http_proxy:-}"
|
|
||||||
local _http_no_proxy="${var_http_no_proxy:-}"
|
|
||||||
local _mtu="${var_mtu:-}"
|
local _mtu="${var_mtu:-}"
|
||||||
local _sd="${var_searchdomain:-}"
|
local _sd="${var_searchdomain:-}"
|
||||||
local _ns="${var_ns:-}"
|
local _ns="${var_ns:-}"
|
||||||
@@ -2651,46 +2626,9 @@ advanced_settings() {
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
# STEP 24: HTTP/HTTPS Proxy
|
# STEP 24: Container Timezone
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
24)
|
24)
|
||||||
local http_proxy_default_flag="--defaultno"
|
|
||||||
[[ -n "$_http_proxy" ]] && http_proxy_default_flag=""
|
|
||||||
|
|
||||||
if whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
|
|
||||||
--title "HTTP/HTTPS PROXY" \
|
|
||||||
--ok-button "Next" --cancel-button "Back" \
|
|
||||||
$http_proxy_default_flag \
|
|
||||||
--yesno "\nUse HTTP/HTTPS proxy?\n\nRequired when internet access must go through a proxy server.\n(e.g. corporate networks)\n\n(App default: ${var_http_proxy:-none})" 14 62; then
|
|
||||||
if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
|
|
||||||
--title "HTTP PROXY URL" \
|
|
||||||
--inputbox "\nEnter HTTP proxy URL:\n(e.g. http://proxy.local:8080)" 12 62 "$_http_proxy" \
|
|
||||||
3>&1 1>&2 2>&3); then
|
|
||||||
_http_proxy="$result"
|
|
||||||
local _no_proxy_default="${_http_no_proxy:-localhost,127.0.0.1,.local}"
|
|
||||||
if result=$(whiptail --backtitle "Proxmox VE Helper Scripts [Step $STEP/$MAX_STEP]" \
|
|
||||||
--title "NO_PROXY EXCEPTIONS" \
|
|
||||||
--inputbox "\nEnter NO_PROXY exceptions (comma-separated):\nLeave empty for defaults." 12 62 "$_no_proxy_default" \
|
|
||||||
3>&1 1>&2 2>&3); then
|
|
||||||
_http_no_proxy="$result"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ $? -eq 1 ]; then
|
|
||||||
_http_proxy=""
|
|
||||||
_http_no_proxy=""
|
|
||||||
else
|
|
||||||
((STEP--))
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
((STEP++))
|
|
||||||
;;
|
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
|
||||||
# STEP 25: Container Timezone
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
|
||||||
25)
|
|
||||||
local tz_hint="$_ct_timezone"
|
local tz_hint="$_ct_timezone"
|
||||||
[[ -z "$tz_hint" ]] && tz_hint="(empty - will use host timezone)"
|
[[ -z "$tz_hint" ]] && tz_hint="(empty - will use host timezone)"
|
||||||
|
|
||||||
@@ -2713,9 +2651,9 @@ advanced_settings() {
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
# STEP 26: Container Protection
|
# STEP 25: Container Protection
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
26)
|
25)
|
||||||
local protect_default_flag="--defaultno"
|
local protect_default_flag="--defaultno"
|
||||||
[[ "$_protect_ct" == "yes" || "$_protect_ct" == "1" ]] && protect_default_flag=""
|
[[ "$_protect_ct" == "yes" || "$_protect_ct" == "1" ]] && protect_default_flag=""
|
||||||
|
|
||||||
@@ -2737,9 +2675,9 @@ advanced_settings() {
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
# STEP 27: Device Node Creation (mknod)
|
# STEP 26: Device Node Creation (mknod)
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
27)
|
26)
|
||||||
local mknod_default_flag="--defaultno"
|
local mknod_default_flag="--defaultno"
|
||||||
[[ "$_enable_mknod" == "1" ]] && mknod_default_flag=""
|
[[ "$_enable_mknod" == "1" ]] && mknod_default_flag=""
|
||||||
|
|
||||||
@@ -2761,9 +2699,9 @@ advanced_settings() {
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
# STEP 28: Mount Filesystems
|
# STEP 27: Mount Filesystems
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
28)
|
27)
|
||||||
local mount_hint=""
|
local mount_hint=""
|
||||||
[[ -n "$_mount_fs" ]] && mount_hint="$_mount_fs" || mount_hint="(none)"
|
[[ -n "$_mount_fs" ]] && mount_hint="$_mount_fs" || mount_hint="(none)"
|
||||||
|
|
||||||
@@ -2784,9 +2722,9 @@ advanced_settings() {
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
# STEP 29: Optional host-side post-install hook (path on the Proxmox HOST)
|
# STEP 28: Optional host-side post-install hook (path on the Proxmox HOST)
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
29)
|
28)
|
||||||
local _hook_prompt="Optional: absolute path to a *.sh file ON THE PROXMOX HOST.
|
local _hook_prompt="Optional: absolute path to a *.sh file ON THE PROXMOX HOST.
|
||||||
|
|
||||||
It runs as root on the HOST (NOT in the LXC) after the container
|
It runs as root on the HOST (NOT in the LXC) after the container
|
||||||
@@ -2836,9 +2774,9 @@ Leave empty to skip."
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
# STEP 30: Verbose Mode & Confirmation
|
# STEP 29: Verbose Mode & Confirmation
|
||||||
# ═══════════════════════════════════════════════════════════════════════════
|
# ═══════════════════════════════════════════════════════════════════════════
|
||||||
30)
|
29)
|
||||||
local verbose_default_flag="--defaultno"
|
local verbose_default_flag="--defaultno"
|
||||||
[[ "$_verbose" == "yes" ]] && verbose_default_flag=""
|
[[ "$_verbose" == "yes" ]] && verbose_default_flag=""
|
||||||
|
|
||||||
@@ -2866,7 +2804,6 @@ Leave empty to skip."
|
|||||||
local tz_display="${_ct_timezone:-Host TZ}"
|
local tz_display="${_ct_timezone:-Host TZ}"
|
||||||
local apt_display="${_apt_cacher:-no}"
|
local apt_display="${_apt_cacher:-no}"
|
||||||
[[ "$_apt_cacher" == "yes" && -n "$_apt_cacher_ip" ]] && apt_display="$_apt_cacher_ip"
|
[[ "$_apt_cacher" == "yes" && -n "$_apt_cacher_ip" ]] && apt_display="$_apt_cacher_ip"
|
||||||
local http_proxy_display="${_http_proxy:-(none)}"
|
|
||||||
|
|
||||||
local post_install_display="${_post_install:-(none)}"
|
local post_install_display="${_post_install:-(none)}"
|
||||||
local post_install_warn=""
|
local post_install_warn=""
|
||||||
@@ -2896,7 +2833,6 @@ Features:
|
|||||||
Advanced:
|
Advanced:
|
||||||
Timezone: $tz_display
|
Timezone: $tz_display
|
||||||
APT Cacher: $apt_display
|
APT Cacher: $apt_display
|
||||||
HTTP Proxy: $http_proxy_display
|
|
||||||
Verbose: $_verbose
|
Verbose: $_verbose
|
||||||
Post-Install Script: ${post_install_display}${post_install_warn}"
|
Post-Install Script: ${post_install_display}${post_install_warn}"
|
||||||
|
|
||||||
@@ -2940,8 +2876,6 @@ Advanced:
|
|||||||
CT_TIMEZONE="$_ct_timezone"
|
CT_TIMEZONE="$_ct_timezone"
|
||||||
APT_CACHER="$_apt_cacher"
|
APT_CACHER="$_apt_cacher"
|
||||||
APT_CACHER_IP="$_apt_cacher_ip"
|
APT_CACHER_IP="$_apt_cacher_ip"
|
||||||
HTTP_PROXY="$_http_proxy"
|
|
||||||
HTTP_NO_PROXY="$_http_no_proxy"
|
|
||||||
VERBOSE="$_verbose"
|
VERBOSE="$_verbose"
|
||||||
var_post_install="$_post_install"
|
var_post_install="$_post_install"
|
||||||
|
|
||||||
@@ -2957,8 +2891,6 @@ Advanced:
|
|||||||
var_timezone="$_ct_timezone"
|
var_timezone="$_ct_timezone"
|
||||||
var_apt_cacher="$_apt_cacher"
|
var_apt_cacher="$_apt_cacher"
|
||||||
var_apt_cacher_ip="$_apt_cacher_ip"
|
var_apt_cacher_ip="$_apt_cacher_ip"
|
||||||
var_http_proxy="$_http_proxy"
|
|
||||||
var_http_no_proxy="$_http_no_proxy"
|
|
||||||
|
|
||||||
# Format optional values
|
# Format optional values
|
||||||
[[ -n "$_mtu" ]] && MTU=",mtu=$_mtu" || MTU=""
|
[[ -n "$_mtu" ]] && MTU=",mtu=$_mtu" || MTU=""
|
||||||
@@ -2996,7 +2928,6 @@ Advanced:
|
|||||||
[[ "${PROTECT_CT:-no}" == "yes" || "${PROTECT_CT:-no}" == "1" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Protection: ${BGN}Enabled${CL}"
|
[[ "${PROTECT_CT:-no}" == "yes" || "${PROTECT_CT:-no}" == "1" ]] && echo -e "${CONTAINERTYPE}${BOLD}${DGN}Protection: ${BGN}Enabled${CL}"
|
||||||
[[ -n "${CT_TIMEZONE:-}" ]] && echo -e "${INFO}${BOLD}${DGN}Timezone: ${BGN}$CT_TIMEZONE${CL}"
|
[[ -n "${CT_TIMEZONE:-}" ]] && echo -e "${INFO}${BOLD}${DGN}Timezone: ${BGN}$CT_TIMEZONE${CL}"
|
||||||
[[ "$APT_CACHER" == "yes" ]] && echo -e "${INFO}${BOLD}${DGN}APT Cacher: ${BGN}$APT_CACHER_IP${CL}"
|
[[ "$APT_CACHER" == "yes" ]] && echo -e "${INFO}${BOLD}${DGN}APT Cacher: ${BGN}$APT_CACHER_IP${CL}"
|
||||||
[[ -n "${HTTP_PROXY:-}" ]] && echo -e "${INFO}${BOLD}${DGN}HTTP Proxy: ${BGN}$HTTP_PROXY${CL}"
|
|
||||||
echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}$VERBOSE${CL}"
|
echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}$VERBOSE${CL}"
|
||||||
echo -e "${CREATING}${BOLD}${RD}Creating an LXC of ${APP} using the above advanced settings${CL}"
|
echo -e "${CREATING}${BOLD}${RD}Creating an LXC of ${APP} using the above advanced settings${CL}"
|
||||||
|
|
||||||
@@ -3834,47 +3765,6 @@ start() {
|
|||||||
# SECTION 8: CONTAINER CREATION & DEPLOYMENT
|
# SECTION 8: CONTAINER CREATION & DEPLOYMENT
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
# _apply_http_proxy_in_container()
|
|
||||||
#
|
|
||||||
# - Writes persistent proxy settings into the LXC before base package install
|
|
||||||
# - Ensures apt/apk/curl work behind corporate proxies during early setup
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
_apply_http_proxy_in_container() {
|
|
||||||
local proxy="${HTTP_PROXY:-}"
|
|
||||||
local noproxy="${HTTP_NO_PROXY:-}"
|
|
||||||
[[ -z "$proxy" || -z "${CTID:-}" ]] && return 0
|
|
||||||
[[ -z "$noproxy" ]] && noproxy="localhost,127.0.0.1,.local"
|
|
||||||
|
|
||||||
msg_info "Applying HTTP proxy in container"
|
|
||||||
local tmpf
|
|
||||||
tmpf="$(mktemp)"
|
|
||||||
cat >"$tmpf" <<EOF
|
|
||||||
export http_proxy="$proxy"
|
|
||||||
export https_proxy="$proxy"
|
|
||||||
export HTTP_PROXY="$proxy"
|
|
||||||
export HTTPS_PROXY="$proxy"
|
|
||||||
export no_proxy="$noproxy"
|
|
||||||
export NO_PROXY="$noproxy"
|
|
||||||
EOF
|
|
||||||
pct push "$CTID" "$tmpf" /etc/profile.d/90-http-proxy.sh >/dev/null 2>&1 || {
|
|
||||||
rm -f "$tmpf"
|
|
||||||
msg_warn "Failed to push HTTP proxy profile into container"
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
pct exec "$CTID" -- chmod 644 /etc/profile.d/90-http-proxy.sh >/dev/null 2>&1 || true
|
|
||||||
|
|
||||||
if [[ "$var_os" != "alpine" && "${APT_CACHER:-}" != "yes" ]]; then
|
|
||||||
cat >"$tmpf" <<EOF
|
|
||||||
Acquire::http::Proxy "$proxy";
|
|
||||||
Acquire::https::Proxy "$proxy";
|
|
||||||
EOF
|
|
||||||
pct push "$CTID" "$tmpf" /etc/apt/apt.conf.d/95http-proxy >/dev/null 2>&1 || true
|
|
||||||
fi
|
|
||||||
rm -f "$tmpf"
|
|
||||||
msg_ok "Applied HTTP proxy in container"
|
|
||||||
}
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# build_container()
|
# build_container()
|
||||||
#
|
#
|
||||||
@@ -4001,12 +3891,6 @@ build_container() {
|
|||||||
export SESSION_ID="$SESSION_ID"
|
export SESSION_ID="$SESSION_ID"
|
||||||
export CACHER="$APT_CACHER"
|
export CACHER="$APT_CACHER"
|
||||||
export CACHER_IP="$APT_CACHER_IP"
|
export CACHER_IP="$APT_CACHER_IP"
|
||||||
if [[ -n "${HTTP_PROXY:-}" ]]; then
|
|
||||||
export HTTP_PROXY HTTPS_PROXY="$HTTP_PROXY" http_proxy="$HTTP_PROXY" https_proxy="$HTTP_PROXY"
|
|
||||||
export NO_PROXY="${HTTP_NO_PROXY:-}" no_proxy="${HTTP_NO_PROXY:-}"
|
|
||||||
export var_http_proxy="$HTTP_PROXY"
|
|
||||||
export var_http_no_proxy="${HTTP_NO_PROXY:-}"
|
|
||||||
fi
|
|
||||||
export tz="$timezone"
|
export tz="$timezone"
|
||||||
export APPLICATION="$APP"
|
export APPLICATION="$APP"
|
||||||
export app="$NSAPP"
|
export app="$NSAPP"
|
||||||
@@ -4491,8 +4375,6 @@ EOF
|
|||||||
|
|
||||||
local install_exit_code=0
|
local install_exit_code=0
|
||||||
|
|
||||||
_apply_http_proxy_in_container
|
|
||||||
|
|
||||||
# Continue with standard container setup
|
# Continue with standard container setup
|
||||||
if [ "$var_os" == "alpine" ]; then
|
if [ "$var_os" == "alpine" ]; then
|
||||||
sleep 3
|
sleep 3
|
||||||
@@ -4500,13 +4382,10 @@ EOF
|
|||||||
https://dl-cdn.alpinelinux.org/alpine/latest-stable/main
|
https://dl-cdn.alpinelinux.org/alpine/latest-stable/main
|
||||||
https://dl-cdn.alpinelinux.org/alpine/latest-stable/community
|
https://dl-cdn.alpinelinux.org/alpine/latest-stable/community
|
||||||
EOF'
|
EOF'
|
||||||
pct exec "$CTID" -- ash -c 'set -a; [ -f /etc/profile.d/90-http-proxy.sh ] && . /etc/profile.d/90-http-proxy.sh; set +a; apk add bash newt curl openssh nano mc ncurses jq' >>"$BUILD_LOG" 2>&1 || {
|
pct exec "$CTID" -- ash -c "apk add bash newt curl openssh nano mc ncurses jq" >>"$BUILD_LOG" 2>&1 || {
|
||||||
msg_warn "apk install failed (dl-cdn.alpinelinux.org), trying alternate mirrors..."
|
msg_warn "apk install failed (dl-cdn.alpinelinux.org), trying alternate mirrors..."
|
||||||
local alpine_exit=0
|
local alpine_exit=0
|
||||||
pct exec "$CTID" -- ash -c '
|
pct exec "$CTID" -- ash -c '
|
||||||
set -a
|
|
||||||
[ -f /etc/profile.d/90-http-proxy.sh ] && . /etc/profile.d/90-http-proxy.sh
|
|
||||||
set +a
|
|
||||||
ALPINE_MIRRORS="mirror.init7.net ftp.halifax.rwth-aachen.de mirrors.edge.kernel.org alpine.mirror.wearetriple.com mirror.leaseweb.com uk.alpinelinux.org dl-2.alpinelinux.org dl-4.alpinelinux.org"
|
ALPINE_MIRRORS="mirror.init7.net ftp.halifax.rwth-aachen.de mirrors.edge.kernel.org alpine.mirror.wearetriple.com mirror.leaseweb.com uk.alpinelinux.org dl-2.alpinelinux.org dl-4.alpinelinux.org"
|
||||||
for m in $(printf "%s\n" $ALPINE_MIRRORS | shuf); do
|
for m in $(printf "%s\n" $ALPINE_MIRRORS | shuf); do
|
||||||
if wget -q --spider --timeout=2 "http://$m/alpine/latest-stable/main/" 2>/dev/null; then
|
if wget -q --spider --timeout=2 "http://$m/alpine/latest-stable/main/" 2>/dev/null; then
|
||||||
@@ -4565,16 +4444,13 @@ EOF
|
|||||||
pct exec "$CTID" -- bash -c "echo -e 'nameserver 8.8.8.8\nnameserver 1.1.1.1' >/etc/resolv.conf"
|
pct exec "$CTID" -- bash -c "echo -e 'nameserver 8.8.8.8\nnameserver 1.1.1.1' >/etc/resolv.conf"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pct exec "$CTID" -- bash -c "set -a; [ -f /etc/profile.d/90-http-proxy.sh ] && . /etc/profile.d/90-http-proxy.sh; set +a; apt-get update 2>&1 && apt-get install -y ${_base_pkgs} 2>&1" >>"$BUILD_LOG" 2>&1 || {
|
pct exec "$CTID" -- bash -c "apt-get update 2>&1 && apt-get install -y ${_base_pkgs} 2>&1" >>"$BUILD_LOG" 2>&1 || {
|
||||||
local failed_mirror
|
local failed_mirror
|
||||||
failed_mirror=$(pct exec "$CTID" -- bash -c "grep -m1 -oP '(?<=URIs: https?://)[^/]+' /etc/apt/sources.list.d/debian.sources 2>/dev/null || grep -m1 -oP '(?<=deb https?://)[^/]+' /etc/apt/sources.list 2>/dev/null" 2>/dev/null || echo "unknown")
|
failed_mirror=$(pct exec "$CTID" -- bash -c "grep -m1 -oP '(?<=URIs: https?://)[^/]+' /etc/apt/sources.list.d/debian.sources 2>/dev/null || grep -m1 -oP '(?<=deb https?://)[^/]+' /etc/apt/sources.list 2>/dev/null" 2>/dev/null || echo "unknown")
|
||||||
msg_warn "apt-get update failed (${failed_mirror})."
|
msg_warn "apt-get update failed (${failed_mirror})."
|
||||||
msg_custom "ℹ️" "${YW}" "Probing alternate mirrors (this can take 1-2 minutes on network issues)"
|
msg_custom "ℹ️" "${YW}" "Probing alternate mirrors (this can take 1-2 minutes on network issues)"
|
||||||
local mirror_exit=0
|
local mirror_exit=0
|
||||||
pct exec "$CTID" -- env APT_BASE="$_base_pkgs" bash -c '
|
pct exec "$CTID" -- env APT_BASE="$_base_pkgs" bash -c '
|
||||||
set -a
|
|
||||||
[ -f /etc/profile.d/90-http-proxy.sh ] && . /etc/profile.d/90-http-proxy.sh
|
|
||||||
set +a
|
|
||||||
DISTRO=$(. /etc/os-release 2>/dev/null && echo "$ID" || echo "debian")
|
DISTRO=$(. /etc/os-release 2>/dev/null && echo "$ID" || echo "debian")
|
||||||
echo " Mirror fallback for distro: $DISTRO"
|
echo " Mirror fallback for distro: $DISTRO"
|
||||||
|
|
||||||
@@ -5845,6 +5721,7 @@ create_lxc_container() {
|
|||||||
msg_debug "No newer candidate for pve-container/lxc-pve (installed=$_pvec_i/$_lxcp_i, cand=$_pvec_c/$_lxcp_c)"
|
msg_debug "No newer candidate for pve-container/lxc-pve (installed=$_pvec_i/$_lxcp_i, cand=$_pvec_c/$_lxcp_c)"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local _disable_update="${DISABLE_UPDATE:-no}"
|
local _disable_update="${DISABLE_UPDATE:-no}"
|
||||||
if [[ "${PHS_SILENT:-0}" == "1" || "${_disable_update,,}" == "yes" ]]; then
|
if [[ "${PHS_SILENT:-0}" == "1" || "${_disable_update,,}" == "yes" ]]; then
|
||||||
msg_info "Skipping host LXC stack upgrade prompt (unattended mode)"
|
msg_info "Skipping host LXC stack upgrade prompt (unattended mode)"
|
||||||
|
|||||||
@@ -970,53 +970,6 @@ is_verbose_mode() {
|
|||||||
[[ "$verbose" != "no" ]]
|
[[ "$verbose" != "no" ]]
|
||||||
}
|
}
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
# configure_http_proxy()
|
|
||||||
#
|
|
||||||
# - Applies var_http_proxy / var_http_no_proxy inside the container
|
|
||||||
# - Persists proxy env for login shells, systemd, and package managers
|
|
||||||
# - Skips APT proxy config when APT Cacher-NG is active
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
configure_http_proxy() {
|
|
||||||
local proxy="${HTTP_PROXY:-${http_proxy:-${var_http_proxy:-}}}"
|
|
||||||
local noproxy="${HTTP_NO_PROXY:-${no_proxy:-${var_http_no_proxy:-}}}"
|
|
||||||
[[ -z "$proxy" ]] && return 0
|
|
||||||
[[ -z "$noproxy" ]] && noproxy="localhost,127.0.0.1,.local"
|
|
||||||
|
|
||||||
msg_info "Configuring HTTP proxy"
|
|
||||||
cat >/etc/profile.d/90-http-proxy.sh <<EOF
|
|
||||||
export http_proxy="$proxy"
|
|
||||||
export https_proxy="$proxy"
|
|
||||||
export HTTP_PROXY="$proxy"
|
|
||||||
export HTTPS_PROXY="$proxy"
|
|
||||||
export no_proxy="$noproxy"
|
|
||||||
export NO_PROXY="$noproxy"
|
|
||||||
EOF
|
|
||||||
chmod 644 /etc/profile.d/90-http-proxy.sh
|
|
||||||
|
|
||||||
if ! grep -q '^http_proxy=' /etc/environment 2>/dev/null; then
|
|
||||||
cat >>/etc/environment <<EOF
|
|
||||||
http_proxy=$proxy
|
|
||||||
https_proxy=$proxy
|
|
||||||
HTTP_PROXY=$proxy
|
|
||||||
HTTPS_PROXY=$proxy
|
|
||||||
no_proxy=$noproxy
|
|
||||||
NO_PROXY=$noproxy
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${CACHER:-}" != "yes" && -d /etc/apt/apt.conf.d ]]; then
|
|
||||||
cat >/etc/apt/apt.conf.d/95http-proxy <<EOF
|
|
||||||
Acquire::http::Proxy "$proxy";
|
|
||||||
Acquire::https::Proxy "$proxy";
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
|
|
||||||
export http_proxy="$proxy" https_proxy="$proxy" HTTP_PROXY="$proxy" HTTPS_PROXY="$proxy"
|
|
||||||
export no_proxy="$noproxy" NO_PROXY="$noproxy"
|
|
||||||
msg_ok "Configured HTTP proxy"
|
|
||||||
}
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# is_unattended()
|
# is_unattended()
|
||||||
#
|
#
|
||||||
|
|||||||
+2
-3
@@ -388,8 +388,7 @@ apt_update_safe() {
|
|||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
update_os() {
|
update_os() {
|
||||||
msg_info "Updating Container OS"
|
msg_info "Updating Container OS"
|
||||||
configure_http_proxy
|
if [[ "$CACHER" == "yes" ]]; then
|
||||||
if [[ "$CACHER" == "yes" && -z "${HTTP_PROXY:-${http_proxy:-}}" ]]; then
|
|
||||||
echo 'Acquire::http::Proxy-Auto-Detect "/usr/local/bin/apt-proxy-detect.sh";' >/etc/apt/apt.conf.d/00aptproxy
|
echo 'Acquire::http::Proxy-Auto-Detect "/usr/local/bin/apt-proxy-detect.sh";' >/etc/apt/apt.conf.d/00aptproxy
|
||||||
local _proxy_raw="${CACHER_IP}"
|
local _proxy_raw="${CACHER_IP}"
|
||||||
local _proxy_host _proxy_port _proxy_url
|
local _proxy_host _proxy_port _proxy_url
|
||||||
@@ -510,7 +509,7 @@ EOF
|
|||||||
systemctl restart "$(basename "$(dirname "$GETTY_OVERRIDE")" | sed 's/\.d//')"
|
systemctl restart "$(basename "$(dirname "$GETTY_OVERRIDE")" | sed 's/\.d//')"
|
||||||
msg_ok "Customized Container"
|
msg_ok "Customized Container"
|
||||||
fi
|
fi
|
||||||
echo 'set -a; [ -f /etc/profile.d/90-http-proxy.sh ] && . /etc/profile.d/90-http-proxy.sh; set +a; bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/'"${app}"'.sh)"' >/usr/bin/update
|
echo "bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/${app}.sh)\"" >/usr/bin/update
|
||||||
chmod +x /usr/bin/update
|
chmod +x /usr/bin/update
|
||||||
|
|
||||||
if [[ -n "${SSH_AUTHORIZED_KEY}" ]]; then
|
if [[ -n "${SSH_AUTHORIZED_KEY}" ]]; then
|
||||||
|
|||||||
@@ -54,11 +54,6 @@ if ! pveversion | grep -Eq "pve-manager/8\.[0-4](\.[0-9]+)*"; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture 2>/dev/null)" = "arm64" ]; then
|
|
||||||
echo -e "${RD}Intel HW acceleration is only available on x86 (Intel) systems.${CL}"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
whiptail --backtitle "Proxmox VE Helper Scripts" --title "Add Intel HW Acceleration" --yesno "This Will Add Intel HW Acceleration to an existing LXC Container. Proceed?" 8 72
|
whiptail --backtitle "Proxmox VE Helper Scripts" --title "Add Intel HW Acceleration" --yesno "This Will Add Intel HW Acceleration to an existing LXC Container. Proceed?" 8 72
|
||||||
NODE=$(hostname)
|
NODE=$(hostname)
|
||||||
PREV_MENU=()
|
PREV_MENU=()
|
||||||
|
|||||||
@@ -139,12 +139,6 @@ if ! command -v pveversion >/dev/null 2>&1; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture 2>/dev/null)" = "arm64" ]; then
|
|
||||||
header_info
|
|
||||||
msg_error "CPU microcode updates are only available for x86 (Intel/AMD) systems."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE Processor Microcode" --yesno "This will check for CPU microcode packages with the option to install. Proceed?" 10 58
|
whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE Processor Microcode" --yesno "This will check for CPU microcode packages with the option to install. Proceed?" 10 58
|
||||||
|
|
||||||
msg_info "Checking CPU Vendor"
|
msg_info "Checking CPU Vendor"
|
||||||
|
|||||||
@@ -157,12 +157,6 @@ if [ ! -f /etc/proxmox-backup/user.cfg ]; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture 2>/dev/null)" = "arm64" ]; then
|
|
||||||
header_info
|
|
||||||
msg_error "CPU microcode updates are only available for x86 (Intel/AMD) systems."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
whiptail --backtitle "Proxmox Backup Server Helper Scripts" \
|
whiptail --backtitle "Proxmox Backup Server Helper Scripts" \
|
||||||
--title "Proxmox Backup Server Processor Microcode" \
|
--title "Proxmox Backup Server Processor Microcode" \
|
||||||
--yesno "This script searches for CPU microcode packages and offers the option to install them.\nProceed?" 10 68
|
--yesno "This script searches for CPU microcode packages and offers the option to install them.\nProceed?" 10 68
|
||||||
|
|||||||
@@ -175,10 +175,4 @@ while true; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture 2>/dev/null)" = "arm64" ]; then
|
|
||||||
header_info
|
|
||||||
msg_error "This upgrade script targets the amd64 Proxmox repositories and is not supported on ARM64."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
start_routines
|
start_routines
|
||||||
|
|||||||
@@ -199,10 +199,4 @@ while true; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture 2>/dev/null)" = "arm64" ]; then
|
|
||||||
header_info
|
|
||||||
msg_error "This upgrade script targets the amd64 Proxmox repositories and is not supported on ARM64."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
start_routines
|
start_routines
|
||||||
|
|||||||
@@ -135,12 +135,6 @@ EOF
|
|||||||
no) msg_error "Selected no to Correcting Debian Sources" ;;
|
no) msg_error "Selected no to Correcting Debian Sources" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ "$(dpkg --print-architecture 2>/dev/null)" == "arm64" ]]; then
|
|
||||||
msg_ok "ARM64 detected - skipping Proxmox repository setup"
|
|
||||||
post_routines_common
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Enterprise repo ---
|
# --- Enterprise repo ---
|
||||||
read -r state file <<<"$(repo_state_list pbs-enterprise)"
|
read -r state file <<<"$(repo_state_list pbs-enterprise)"
|
||||||
case $state in
|
case $state in
|
||||||
@@ -215,12 +209,6 @@ EOF
|
|||||||
no) msg_error "Selected no to Correcting Debian Sources" ;;
|
no) msg_error "Selected no to Correcting Debian Sources" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ "$(dpkg --print-architecture 2>/dev/null)" == "arm64" ]]; then
|
|
||||||
msg_ok "ARM64 detected - skipping Proxmox repository setup"
|
|
||||||
post_routines_common
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- Enterprise repo ---
|
# --- Enterprise repo ---
|
||||||
if component_exists_in_sources "pbs-enterprise"; then
|
if component_exists_in_sources "pbs-enterprise"; then
|
||||||
CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PBS Enterprise Repository" --menu \
|
CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PBS Enterprise Repository" --menu \
|
||||||
|
|||||||
@@ -53,11 +53,6 @@ if ! dpkg -s proxmox-mailgateway-container >/dev/null 2>&1 &&
|
|||||||
exit 232
|
exit 232
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture 2>/dev/null)" = "arm64" ]; then
|
|
||||||
msg_error "Proxmox Mail Gateway does not support ARM64."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
repo_state() {
|
repo_state() {
|
||||||
# $1 = repo name (e.g. pmg-enterprise, pmg-no-subscription, pmgtest)
|
# $1 = repo name (e.g. pmg-enterprise, pmg-no-subscription, pmgtest)
|
||||||
local repo="$1"
|
local repo="$1"
|
||||||
|
|||||||
@@ -125,12 +125,6 @@ EOF
|
|||||||
no) msg_error "Selected no to Correcting Proxmox VE Sources" ;;
|
no) msg_error "Selected no to Correcting Proxmox VE Sources" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ "$(dpkg --print-architecture 2>/dev/null)" == "arm64" ]]; then
|
|
||||||
msg_ok "ARM64 detected - skipping Proxmox repository setup"
|
|
||||||
post_routines_common
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PVE-ENTERPRISE" --menu "The 'pve-enterprise' repository is only available to users who have purchased a Proxmox VE subscription.\n \nDisable 'pve-enterprise' repository?" 14 58 2 \
|
CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PVE-ENTERPRISE" --menu "The 'pve-enterprise' repository is only available to users who have purchased a Proxmox VE subscription.\n \nDisable 'pve-enterprise' repository?" 14 58 2 \
|
||||||
"yes" " " \
|
"yes" " " \
|
||||||
"no" " " 3>&2 2>&1 1>&3)
|
"no" " " 3>&2 2>&1 1>&3)
|
||||||
@@ -288,12 +282,6 @@ EOF
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$(dpkg --print-architecture 2>/dev/null)" == "arm64" ]]; then
|
|
||||||
msg_ok "ARM64 detected - skipping Proxmox repository setup"
|
|
||||||
post_routines_common
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ---- PVE-ENTERPRISE ----
|
# ---- PVE-ENTERPRISE ----
|
||||||
if component_exists_in_sources "pve-enterprise"; then
|
if component_exists_in_sources "pve-enterprise"; then
|
||||||
CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" \
|
CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" \
|
||||||
|
|||||||
@@ -131,12 +131,6 @@ if ! command -v pveversion >/dev/null 2>&1; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(dpkg --print-architecture 2>/dev/null)" = "arm64" ]; then
|
|
||||||
header_info
|
|
||||||
msg_error "This upgrade script targets the amd64 Proxmox VE repositories and is not supported on ARM64."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! pveversion | grep -Eq "pve-manager/(7\.4-(16|17|18|19))"; then
|
if ! pveversion | grep -Eq "pve-manager/(7\.4-(16|17|18|19))"; then
|
||||||
header_info
|
header_info
|
||||||
msg_error "This version of Proxmox Virtual Environment is not supported"
|
msg_error "This version of Proxmox Virtual Environment is not supported"
|
||||||
|
|||||||
Reference in New Issue
Block a user