bump java 21

ct/jotty.sh

@@ -48,17 +48,6 @@ function update_script() {
     $STD yarn --frozen-lockfile
     $STD yarn next telemetry disable
     $STD yarn build
-
-    [ -d "public" ] && cp -r public .next/standalone/
-    [ -d "howto" ] && cp -r howto .next/standalone/
-    mkdir -p .next/standalone/.next
-    cp -r .next/static .next/standalone/.next/
-
-    mv .next/standalone /tmp/jotty_standalone
-    rm -rf * .next .git .gitignore .yarn
-    mv /tmp/jotty_standalone/* .
-    mv /tmp/jotty_standalone/.[!.]* . 2>/dev/null || true
-    rm -rf /tmp/jotty_standalone
     msg_ok "Updated jotty"
 
     msg_info "Restoring configuration & data"
@@ -66,24 +55,6 @@ function update_script() {
     $STD tar -xf /opt/data_config.tar
     msg_ok "Restored configuration & data"
 
-    msg_info "Updating Service"
-    cat <<EOF >/etc/systemd/system/jotty.service
-[Unit]
-Description=jotty server
-After=network.target
-
-[Service]
-WorkingDirectory=/opt/jotty
-EnvironmentFile=/opt/jotty/.env
-ExecStart=/usr/bin/node server.js
-Restart=on-abnormal
-
-[Install]
-WantedBy=multi-user.target
-EOF
-    systemctl daemon-reload
-    msg_ok "Updated Service"
-
     msg_info "Starting Service"
     systemctl start jotty
     msg_ok "Started Service"

ct/unifi.sh

@@ -28,6 +28,8 @@ function update_script() {
     exit
   fi
 
+  JAVA_VERSION="21" setup_java
+
   msg_info "Updating ${APP}"
   $STD apt update --allow-releaseinfo-change
   $STD apt install -y unifi

install/jotty-install.sh

@@ -21,18 +21,6 @@ cd /opt/jotty
 $STD yarn --frozen-lockfile
 $STD yarn next telemetry disable
 $STD yarn build
-
-[ -d "public" ] && cp -r public .next/standalone/
-[ -d "howto" ] && cp -r howto .next/standalone/
-mkdir -p .next/standalone/.next
-cp -r .next/static .next/standalone/.next/
-
-mv .next/standalone /tmp/jotty_standalone
-rm -rf * .next .git .gitignore .yarn
-mv /tmp/jotty_standalone/* .
-mv /tmp/jotty_standalone/.[!.]* . 2>/dev/null || true
-rm -rf /tmp/jotty_standalone
-
 mkdir -p data/{users,checklists,notes}
 
 cat <<EOF >/opt/jotty/.env
@@ -67,7 +55,7 @@ After=network.target
 [Service]
 WorkingDirectory=/opt/jotty
 EnvironmentFile=/opt/jotty/.env
-ExecStart=/usr/bin/node server.js
+ExecStart=yarn start
 Restart=on-abnormal
 
 [Install]

install/unifi-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt install -y apt-transport-https
 msg_ok "Installed Dependencies"
 
-JAVA_VERION="17" setup_java
 setup_deb822_repo \
   "unifi" \
   "https://dl.ui.com/unifi/unifi-repo.gpg" \
@@ -26,17 +25,22 @@ setup_deb822_repo \
   "ubiquiti" \
   "amd64"
 
-if ! grep -q -m1 'avx[^ ]*' /proc/cpuinfo; then
+JAVA_VERSION="21" setup_java
-  msg_warn "No AVX Support Detected. MongoDB v4.4 will be installed"
+
-  if ! dpkg -l | grep -q "libssl1.1"; then
+if lscpu | grep -q 'avx'; then
-    curl -fsSL "https://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.1_1.1.1w-0+deb11u4_amd64.deb" -o "libssl1.1_1.1.1w-0+deb11u4_amd64.deb"
+  MONGO_VERSION="8.0" setup_mongodb
-    $STD dpkg -i libssl1.1_1.1.1w-0+deb11u4_amd64.deb
-  fi
-  MONGO_VERSION="4.4" setup_mongodb
 else
-  MONGO_VERSION="7.0" setup_mongodb
+  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 Unifi, we currently only support AVX CPUs."
+  exit 10
+fi
+
+if ! dpkg -l | grep -q 'libssl1.1'; then
+  msg_info "Installing libssl (if needed)"
+  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"
+  $STD dpkg -i /tmp/libssl.deb
+  rm -f /tmp/libssl.deb
+  msg_ok "Installed libssl1.1"
 fi
-msg_ok "Installed MongoDB"
 
 msg_info "Installing UniFi Network Server"
 $STD apt install -y unifi