Skip to content

Commit 6fc20ae

Browse files
authored
Omada - AVX-only support (#9295)
1 parent 318574f commit 6fc20ae

File tree

3 files changed

+11
-33
lines changed

3 files changed

+11
-33
lines changed

ct/omada.sh

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
1111
var_ram="${var_ram:-3072}"
1212
var_disk="${var_disk:-8}"
1313
var_os="${var_os:-debian}"
14-
var_version="${var_version:-13}"
14+
var_version="${var_version:-12}"
1515
var_unprivileged="${var_unprivileged:-1}"
1616

1717
header_info "$APP"
@@ -32,19 +32,11 @@ function update_script() {
3232
if lscpu | grep -q 'avx'; then
3333
MONGO_VERSION="8.0" setup_mongodb
3434
else
35-
msg_warn "No AVX detected: Using older MongoDB 4.4"
36-
MONGO_VERSION="4.4" setup_mongodb
35+
msg_error "No AVX detected (CPU-Flag)! We have discontinued support for this. You are welcome to try it manually with a Debian LXC, but due to the many issues with Omada, we currently only support AVX CPUs."
36+
exit 10
3737
fi
3838

39-
msg_info "Checking if right Azul Zulu Java is installed"
40-
java_version=$(java -version 2>&1 | awk -F[\"_] '/version/ {print $2}')
41-
if [[ "$java_version" =~ ^1\.8\.* ]]; then
42-
$STD apt remove --purge -y zulu8-jdk
43-
$STD apt -y install zulu21-jre-headless
44-
msg_ok "Updated Azul Zulu Java to 21"
45-
else
46-
msg_ok "Azul Zulu Java 21 already installed"
47-
fi
39+
JAVA_VERSION="21" setup_java
4840

4941
msg_info "Updating Omada Controller"
5042
OMADA_URL=$(curl -fsSL "https://support.omadanetworks.com/en/download/software/omada-controller/" |

frontend/public/json/omada.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ram": 3072,
2424
"hdd": 8,
2525
"os": "debian",
26-
"version": "13"
26+
"version": "12"
2727
}
2828
}
2929
],

install/omada-install.sh

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,15 @@ msg_info "Installing Dependencies"
1717
$STD apt install -y jsvc
1818
msg_ok "Installed Dependencies"
1919

20-
msg_info "Checking CPU Features"
20+
JAVA_VERSION="21" setup_java
21+
2122
if lscpu | grep -q 'avx'; then
22-
MONGODB_VERSION="8.0"
23-
msg_ok "AVX detected: Using MongoDB 8.0"
2423
MONGO_VERSION="8.0" setup_mongodb
2524
else
26-
MONGO_VERSION="4.4" setup_mongodb
25+
msg_error "No AVX detected (CPU-Flag)! We have discontinued support for this. You are welcome to try it manually with a Debian LXC, but due to the many issues with Omada, we currently only support AVX CPUs."
26+
exit 10
2727
fi
2828

29-
msg_info "Installing Azul Zulu Java"
30-
curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xB1998361219BD9C9" -o "/etc/apt/trusted.gpg.d/zulu-repo.asc"
31-
curl -fsSL "https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb" -o zulu-repo.deb
32-
$STD dpkg -i zulu-repo.deb
33-
$STD apt update
34-
$STD apt -y install zulu21-jre-headless
35-
msg_ok "Installed Azul Zulu Java"
36-
37-
3829
if ! dpkg -l | grep -q 'libssl1.1'; then
3930
msg_info "Installing libssl (if needed)"
4031
curl -fsSL "https://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.1_1.1.1w-0+deb11u4_amd64.deb" -o "/tmp/libssl.deb"
@@ -50,14 +41,9 @@ OMADA_URL=$(curl -fsSL "https://support.omadanetworks.com/en/download/software/o
5041
OMADA_PKG=$(basename "$OMADA_URL")
5142
curl -fsSL "$OMADA_URL" -o "$OMADA_PKG"
5243
$STD dpkg -i "$OMADA_PKG"
44+
rm -rf "$OMADA_PKG"
5345
msg_ok "Installed Omada Controller"
5446

5547
motd_ssh
5648
customize
57-
58-
msg_info "Cleaning up"
59-
rm -rf "$OMADA_PKG" zulu-repo.deb
60-
$STD apt -y autoremove
61-
$STD apt -y autoclean
62-
$STD apt -y clean
63-
msg_ok "Cleaned"
49+
cleanup_lxc

0 commit comments

Comments
 (0)