core: fix breaking redownload for lxc containers

ct/emqx.sh

@@ -20,39 +20,18 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-
-  RELEASE=$(curl -fsSL https://www.emqx.com/en/downloads/enterprise | grep -oP '/en/downloads/enterprise/v\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n1)
-  if [[ "$RELEASE" != "$(cat ~/.emqx 2>/dev/null)" ]] || [[ ! -f ~/.emqx ]]; then
-    msg_info "Stopping EMQX"
-    systemctl stop emqx
-    msg_ok "Stopped EMQX"
-
-    msg_info "Downloading EMQX v${RELEASE}"
-    DEB_FILE="/tmp/emqx-enterprise-${RELEASE}-debian12-amd64.deb"
-    curl -fsSL -o "$DEB_FILE" "https://www.emqx.com/en/downloads/enterprise/v${RELEASE}/emqx-enterprise-${RELEASE}-debian12-amd64.deb"
-    msg_ok "Downloaded EMQX"
-
-    msg_info "Installing EMQX"
-    $STD apt-get install -y "$DEB_FILE"
-    msg_ok "Installed EMQX v${RELEASE}"
-
-    msg_info "Starting EMQX"
-    systemctl start emqx
-    echo "$RELEASE" >~/.emqx
-    msg_ok "Started EMQX"
-
-    msg_info "Cleaning Up"
-    rm -f "$DEB_FILE"
-    msg_ok "Cleanup Completed"
-    msg_ok "Update Successful"
-  else
-    msg_ok "No update required. EMQX is already at v${RELEASE}"
-  fi
-
-  exit
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /var ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_info "Updating $APP LXC"
+    $STD apt-get update
+    $STD apt-get -y upgrade
+    msg_ok "Updated $APP LXC"
+    exit
 }
 
 start
@@ -62,4 +41,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:18083${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:18083${CL}"

frontend/public/json/emqx.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": true,
+  "updateable": false,
   "privileged": false,
   "interface_port": 18083,
   "documentation": "https://docs.emqx.com/en/emqx/latest/",

install/emqx-install.sh

@@ -14,38 +14,22 @@ network_check
 update_os
 
 msg_info "Installing dependencies"
-$STD apt-get install -y ca-certificates
+$STD apt-get install -y \
+  apt-transport-https \
+  ca-certificates \
+  lsb-release
 msg_ok "Installed dependencies"
 
-msg_info "Fetching latest EMQX Enterprise version"
-LATEST_VERSION=$(curl -fsSL https://www.emqx.com/en/downloads/enterprise | grep -oP '/en/downloads/enterprise/v\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n1)
-if [[ -z "$LATEST_VERSION" ]]; then
-  msg_error "Failed to determine latest EMQX version"
-  exit 1
-fi
-msg_ok "Latest version: v$LATEST_VERSION"
-
-DOWNLOAD_URL="https://www.emqx.com/en/downloads/enterprise/v$LATEST_VERSION/emqx-enterprise-${LATEST_VERSION}-debian12-amd64.deb"
-DEB_FILE="/tmp/emqx-enterprise-${LATEST_VERSION}-debian12-amd64.deb"
-
-msg_info "Downloading EMQX v$LATEST_VERSION"
-$STD curl -fsSL -o "$DEB_FILE" "$DOWNLOAD_URL"
-msg_ok "Downloaded EMQX"
-
 msg_info "Installing EMQX"
-$STD apt-get install -y "$DEB_FILE"
-echo "$LATEST_VERSION" >~/.emqx
+curl -fsSL https://packagecloud.io/emqx/emqx/gpgkey | gpg --dearmor -o /usr/share/keyrings/emqx-archive-keyring.gpg
+echo "deb [arch=amd64 signed-by=/usr/share/keyrings/emqx-archive-keyring.gpg] https://packagecloud.io/emqx/emqx/debian/ bookworm main" >/etc/apt/sources.list.d/emqx.list
+$STD apt-get install -y emqx
 msg_ok "Installed EMQX"
 
-msg_info "Starting EMQX service"
-$STD systemctl enable -q --now emqx
-msg_ok "Enabled EMQX service"
-
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -f "$DEB_FILE"
 $STD apt-get autoremove
 $STD apt-get autoclean
 msg_ok "Cleaned"

misc/create_lxc.sh

@@ -253,7 +253,7 @@ fi
 TEMPLATE_SEARCH="${PCT_OSTYPE}-${PCT_OSVERSION:-}"
 
 msg_info "Updating LXC Template List"
-if ! timeout 15 pveam update >/dev/null 2>&1; then
+if ! pveam update >/dev/null 2>&1; then
   TEMPLATE_FALLBACK=$(pveam list "$TEMPLATE_STORAGE" | awk "/$TEMPLATE_SEARCH/ {print \$2}" | sort -t - -k 2 -V | tail -n1)
   if [[ -z "$TEMPLATE_FALLBACK" ]]; then
     msg_error "Failed to update LXC template list and no local template matching '$TEMPLATE_SEARCH' found."
@@ -284,7 +284,7 @@ if ! pveam list "$TEMPLATE_STORAGE" | grep -q "$TEMPLATE" || ! zstdcat "$TEMPLAT
   for attempt in {1..3}; do
     msg_info "Attempt $attempt: Downloading LXC template..."
 
-    if timeout 120 pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >/dev/null 2>&1; then
+    if pveam download "$TEMPLATE_STORAGE" "$TEMPLATE" >/dev/null 2>&1; then
       msg_ok "Template download successful."
       break
     fi

misc/tools.func

@@ -54,24 +54,8 @@ function setup_nodejs() {
     echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_VERSION}.x nodistro main" \
       >/etc/apt/sources.list.d/nodesource.list
 
-    sleep 2
     if ! apt-get update >/dev/null 2>&1; then
-      msg_warn "APT update failed – retrying in 5s"
-      sleep 5
-      if ! apt-get update >/dev/null 2>&1; then
-        msg_error "Failed to update APT repositories after adding NodeSource"
-        exit 1
-      fi
-    fi
-
-    if ! apt-cache policy nodejs | grep -q 'Candidate:'; then
-      msg_error "Node.js package not found – repository might be broken or too fresh"
-      apt-cache policy nodejs >&2
-      exit 1
-    fi
-
-    if ! apt-get install -y nodejs >/dev/null 2>&1; then
-      msg_error "Failed to install Node.js ${NODE_VERSION} from NodeSource"
+      msg_error "Failed to update APT repositories after adding NodeSource"
       exit 1
     fi