diff --git a/defaults.inc b/defaults.inc index 08bea87..1bda8c8 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,7 +3,7 @@ action="$1" FOLDER='/opt/idssys/ta-proxmenu' -VERS='2026.3.18' +VERS='2026.3.19' RNIP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) diff --git a/proxmenu-scripts.sh b/proxmenu-scripts.sh index 2c72123..c6766ba 100755 --- a/proxmenu-scripts.sh +++ b/proxmenu-scripts.sh @@ -231,65 +231,65 @@ MAIN_MENU() { echo -e "---------------------------------------------------------------------------" echo - echo -e " [${idsCL[LightYellow]}0${idsCL[Default]}] ${idsCL[White]}Detect CPU-Arch for Live Migrations${idsCL[Default]}" - - echo -en " [${idsCL[LightYellow]}1${idsCL[Default]}] ${idsCL[White]}Run Post-Install Script${idsCL[Default]}" + echo -en " [${idsCL[LightYellow]}0${idsCL[Default]}] ${idsCL[White]}Run Post-Install Script${idsCL[Default]}" [ -f /opt/.PROXMENUX_POST_INSTALL ] && echo -e "${idsCL[Cyan]} - Has been ran prevously${idsCL[Default]}" || echo + echo -e " [${idsCL[LightYellow]}1${idsCL[Default]}] ${idsCL[White]}Detect CPU-Arch for Live Migrations${idsCL[Default]}" + if ! pvesh get /cluster/resources | grep -i pulse &> /dev/null ; then echo -e " [${idsCL[LightYellow]}2${idsCL[Default]}] ${idsCL[White]}Install Pulse Monitoring${idsCL[Default]}" else echo -e "${idsCL[DarkGray]} [2] Pulse Monitoring is already installed${idsCL[Default]}" fi - - echo - if [ "$(systemctl is-active ITSPlatform)" != "active" ]; then - echo -e " [${idsCL[LightYellow]}3${idsCL[Default]}] ${idsCL[White]}Install ConnectWise RMM Agent${idsCL[Default]}" - else - echo -e "${idsCL[DarkGray]} [3] ConnectWise RMM Agent is already installed${idsCL[Default]}" - fi - if [ "$(systemctl is-active connectwise*)" != "active" ]; then - echo -e " [${idsCL[LightYellow]}4${idsCL[Default]}] ${idsCL[White]}Install ScreenConnect Agent${idsCL[Default]}" - else - echo -e "${idsCL[DarkGray]} [4] ScreenConnect is already installed${idsCL[Default]}" - fi - if [ "$(dpkg -l | awk '/cyberprotect/ {print }'|wc -l)" -eq 0 ]; then - echo -e " [${idsCL[LightYellow]}5${idsCL[Default]}] ${idsCL[White]}Install Acronis Backup Agent${idsCL[Default]}" + if [ -f /var/lib/vz/template/iso/${VIRTIO_FILE} ]; then + echo -e "${idsCL[DarkGray]} [3] Current VirtIO drivers already downloaded to 'local' on this host${idsCL[Default]}" + elif [ -f /var/lib/vz/template/iso/virtio*.iso ]; then + echo -e " [${idsCL[LightYellow]}3${idsCL[Default]}] ${idsCL[LightGreen]}**${idsCL[White]}Download the available updated Win-VirtIO drivers to 'local' on this host${idsCL[Default]}" else - echo -e "${idsCL[DarkGray]} [5] Acronis Backup is already installed${idsCL[Default]}" + echo -e " [${idsCL[LightYellow]}3${idsCL[Default]}] ${idsCL[White]}Download the current Win-VirtIO drivers to 'local' on this host${idsCL[Default]}" fi - if [ "$(dpkg -l | awk '/sentinelagent/ {print }'|wc -l)" -eq 0 ]; then - echo -e " [${idsCL[LightYellow]}6${idsCL[Default]}] ${idsCL[White]}Install SentinelOne Agent${idsCL[Default]}" - else - echo -e "${idsCL[DarkGray]} [6] SentinelOne is already installed${idsCL[Default]}" - fi - - echo if ! command -v glances &> /dev/null; then - echo -e " [${idsCL[LightYellow]}7${idsCL[Default]}] ${idsCL[White]}Install Glances (CLI Monitor)${idsCL[Default]}" + echo -e " [${idsCL[LightYellow]}4${idsCL[Default]}] ${idsCL[White]}Install Glances (CLI Monitor)${idsCL[Default]}" else - echo -e "${idsCL[DarkGray]} [7] Glances is already installed${idsCL[Default]}" + echo -e "${idsCL[DarkGray]} [4] Glances is already installed${idsCL[Default]}" fi if [ "$(dpkg -l | awk '/srvadmin-all/ {print }'|wc -l)" -eq 0 ]; then - echo -e " [${idsCL[LightYellow]}8${idsCL[Default]}] ${idsCL[White]}Install Dell OpenManage Server Administrator${idsCL[Default]}" + echo -e " [${idsCL[LightYellow]}5${idsCL[Default]}] ${idsCL[White]}Install Dell OpenManage Server Administrator${idsCL[Default]}" else - echo -e "${idsCL[DarkGray]} [8] Dell OMSA is already installed - ${idsCL[Cyan]}https://${RNIP}:1311" - fi - + echo -e "${idsCL[DarkGray]} [5] Dell OMSA is already installed - ${idsCL[Cyan]}https://${RNIP}:1311" + fi + echo - if [ -f /var/lib/vz/template/iso/${VIRTIO_FILE} ]; then - echo -e "${idsCL[DarkGray]} [9] Current VirtIO drivers already downloaded to 'local' on this host${idsCL[Default]}" - elif [ -f /var/lib/vz/template/iso/virtio*.iso ]; then - echo -e " [${idsCL[LightYellow]}9${idsCL[Default]}] ${idsCL[LightGreen]}**${idsCL[White]}Download the available updated Win-VirtIO drivers to 'local' on this host${idsCL[Default]}" + + if [ "$(systemctl is-active ITSPlatform)" != "active" ]; then + echo -e " [${idsCL[LightYellow]}6${idsCL[Default]}] ${idsCL[White]}Install ConnectWise RMM Agent${idsCL[Default]}" else - echo -e " [${idsCL[LightYellow]}9${idsCL[Default]}] ${idsCL[White]}Download the current Win-VirtIO drivers to 'local' on this host${idsCL[Default]}" + echo -e "${idsCL[DarkGray]} [6] ConnectWise RMM Agent is already installed${idsCL[Default]}" + fi + + if [ "$(dpkg -l | awk '/cyberprotect/ {print }'|wc -l)" -eq 0 ]; then + echo -e " [${idsCL[LightYellow]}7${idsCL[Default]}] ${idsCL[White]}Install Acronis Backup Agent${idsCL[Default]}" + else + echo -e "${idsCL[DarkGray]} [7] Acronis Backup is already installed${idsCL[Default]}" + fi + + if [ "$(dpkg -l | awk '/sentinelagent/ {print }'|wc -l)" -eq 0 ]; then + echo -e " [${idsCL[LightYellow]}8${idsCL[Default]}] ${idsCL[White]}Install SentinelOne Agent${idsCL[Default]}" + else + echo -e "${idsCL[DarkGray]} [8] SentinelOne is already installed${idsCL[Default]}" fi echo echo + if [ "$(systemctl is-active connectwise*)" != "active" ]; then + echo -e " [${idsCL[LightYellow]}S${idsCL[Default]}] ${idsCL[White]}Install ScreenConnect Agent${idsCL[Default]}" + else + echo -e "${idsCL[DarkGray]} [S] ScreenConnect is already installed${idsCL[Default]}" + fi + echo -e " [${idsCL[LightYellow]}M${idsCL[Default]}] ${idsCL[White]}Put Host into Maintenance Mode${idsCL[Default]}" echo -e " [${idsCL[LightYellow]}R${idsCL[Default]}] ${idsCL[White]}Restart Proxmox Services${idsCL[Default]}" echo -e " [${idsCL[LightYellow]}Q${idsCL[Default]}] ${idsCL[White]}Quit${idsCL[Default]}" echo @@ -298,17 +298,18 @@ MAIN_MENU() { read -n 1 opt echo case $opt in - # [1]) [ ! -f /usr/local/bin/menu ] && INSTALL_PROXMENUX || /usr/local/bin/menu;; - [1]) PROXMENUX_POST_INSTALL;; + [0]) PROXMENUX_POST_INSTALL;; + [1]) DETECT_CPU;; [2]) INSTALL_PULSE;; - [3]) INSTALL_RMM;; - [4]) INSTALL_SCREENCONNECT;; - [5]) INSTALL_ACRONIS;; - [6]) INSTALL_S1;; - [7]) INSTALL_GLANCES;; - [8]) INSTALL_OMSA;; - [9]) DOWNLOAD_VIRTIO;; - [0]) DETECT_CPU;; + [3]) DOWNLOAD_VIRTIO;; + [4]) INSTALL_GLANCES;; + [5]) INSTALL_OMSA;; + [6]) INSTALL_RMM;; + [7]) INSTALL_ACRONIS;; + [8]) INSTALL_S1;; + + [Ss]) INSTALL_SCREENCONNECT;; + [Mm]) MAINTENANCE_MODE;; [Rr]) RESTART_PVE_SERVICES;; [Qq]) EXIT1 exit 0;;