ct/omada.sh

@@ -22,8 +22,8 @@ APP="Omada"
 var_disk="8"
 var_cpu="2"
 var_ram="2048"
-var_os="debian"
+var_os="ubuntu"
-var_version="11"
+var_version="20.04"
 variables
 color
 catch_errors

install/omada-install.sh

@@ -18,21 +18,11 @@ $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
 $STD apt-get install -y gnupg
+$STD apt-get install -y openjdk-8-jre-headless
 $STD apt-get install -y jsvc
-msg_ok "Installed Dependencies"
-
-msg_info "Installing Azul Zulu"
-$STD apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
-wget -q https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb
-$STD apt-get install ./zulu-repo_1.0.0-3_all.deb
-$STD apt-get update
-$STD apt-get -y install zulu8-jdk
-msg_ok "Installed Azul Zulu"
-
-msg_info "Installing MongoDB"
 wget -qL https://repo.mongodb.org/apt/ubuntu/dists/bionic/mongodb-org/3.6/multiverse/binary-amd64/mongodb-org-server_3.6.23_amd64.deb
 $STD dpkg -i mongodb-org-server_3.6.23_amd64.deb
-msg_ok "Installed MongoDB"
+msg_ok "Installed Dependencies"
 
 msg_info "Installing Omada Controller v5.9.31"
 wget -qL https://static.tp-link.com/upload/software/2023/202303/20230321/Omada_SDN_Controller_v5.9.31_Linux_x64.deb
@@ -43,7 +33,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f Omada_SDN_Controller_v5.9.31_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb
+rm -f Omada_SDN_Controller_v5.9.31_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb
 $STD apt-get autoremove
 $STD apt-get autoclean
 msg_ok "Cleaned"

misc/monitor-all.sh

@@ -46,7 +46,7 @@ while true; do
     else
       # It is a virtual machine
       config_cmd="qm config"
-      IP=$(qm guest cmd $instance network-get-interfaces | egrep -o "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -E "192\.|10\." | head -n 1)
+      IP=$(qm guest cmd $instance network-get-interfaces | egrep -o "([0-9]{1,3}\.){3}[0-9]{1,3}" | grep -E "192\.|10\.")
     fi
 
     # Skip instances based on templates