Compare commits

..

2 Commits

Author SHA1 Message Date
copilot-swe-agent[bot] d1bfdb0a32 fix(build.func): remove duplicate if statement causing syntax error 2026-06-23 05:27:44 +00:00
copilot-swe-agent[bot] 8e2489ef97 Initial plan 2026-06-23 05:25:28 +00:00
15 changed files with 8 additions and 148 deletions
-30
View File
@@ -488,36 +488,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
## 2026-06-23 ## 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
-6
View File
@@ -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
+3 -5
View File
@@ -30,11 +30,9 @@ function update_script() {
$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
View File
@@ -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
View File
@@ -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"
-11
View File
@@ -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"
-5
View File
@@ -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=()
-6
View File
@@ -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"
-6
View File
@@ -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
-6
View File
@@ -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
-6
View File
@@ -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
-12
View File
@@ -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 \
-5
View File
@@ -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"
-12
View File
@@ -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" \
-6
View File
@@ -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"