From e58e50fc15541df73c9c54ffc1e01a4ab50dc905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?=
 <58952836+tremor021@users.noreply.github.com>
Date: Wed, 9 Jul 2025 10:57:15 +0200
Subject: [PATCH] Refactor (#5840)

---
 frontend/public/json/emqx.json |  4 ----
 install/emqx-install.sh        | 15 +++++++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/public/json/emqx.json b/frontend/public/json/emqx.json
index fbd78367a..f53e5155d 100644
--- a/frontend/public/json/emqx.json
+++ b/frontend/public/json/emqx.json
@@ -35,10 +35,6 @@
     {
       "text": "Setup-Steps: Access Control ➡ Authentication ➡ Create ➡ Next ➡ Next ➡ Create ➡ Users ➡ Add ➡ Username / Password (to authenicate with MQTT) ➡ Save. You're now ready to enjoy a high-performance MQTT Broker.",
       "type": "info"
-    },
-    {
-      "text": "WARNING: Installation sources scripts outside of Community Scripts repo. Please check the source before installing.",
-      "type": "warning"
     }
   ]
 }
diff --git a/install/emqx-install.sh b/install/emqx-install.sh
index 755d1190b..9659806f5 100644
--- a/install/emqx-install.sh
+++ b/install/emqx-install.sh
@@ -13,16 +13,23 @@ setting_up_container
 network_check
 update_os
 
+msg_info "Installing dependencies"
+$STD apt-get install -y \
+  apt-transport-https \
+  ca-certificates \
+  lsb-release
+msg_ok "Installed dependencies"
+
 msg_info "Installing EMQX"
-$STD bash <(curl -fsSL https://packagecloud.io/install/repositories/emqx/emqx/script.deb.sh)
+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
-$STD systemctl enable --now emqx
 msg_ok "Installed EMQX"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
-apt-get autoremove >/dev/null
-apt-get autoclean >/dev/null
+$STD apt-get autoremove
+$STD apt-get autoclean
 msg_ok "Cleaned"