From f194abfe4ded7ed4f67516ae5c56d7ac84076606 Mon Sep 17 00:00:00 2001
From: sfja <sfja2004@gmail.com>
Date: Mon, 30 Mar 2026 12:36:20 +0200
Subject: [PATCH] use mosquitto instead of rabbitmq

---
 backend/.gitignore                |  2 ++
 backend/{deploy => }/deploy.sh    | 10 ++++------
 backend/deploy/docker-compose.yml | 20 +++++---------------
 backend/deploy/install.sh         |  5 +++++
 backend/deploy/mosquitto.conf     |  2 +-
 backend/tests/json.cpp            | 16 ++++++++++++++++
 6 files changed, 33 insertions(+), 22 deletions(-)
 rename backend/{deploy => }/deploy.sh (50%)
 create mode 100755 backend/deploy/install.sh
 create mode 100644 backend/tests/json.cpp

diff --git a/backend/.gitignore b/backend/.gitignore
index 567609b..fed03e0 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -1 +1,3 @@
 build/
+mst-backend.tar.gz
+.vscode/
diff --git a/backend/deploy/deploy.sh b/backend/deploy.sh
similarity index 50%
rename from backend/deploy/deploy.sh
rename to backend/deploy.sh
index bd0c367..13ebf71 100755
--- a/backend/deploy/deploy.sh
+++ b/backend/deploy.sh
@@ -8,15 +8,13 @@ if [[ $user == "" ]]; then
     exit 1
 fi
 
-compose_file=docker-compose.yml
-
 host=10.133.51.127
 
 set -xe
 
-scp $compose_file $user@$host:/home/$user/
+tar czvf mst-backend.tar.gz deploy/*
 
-# echo sudo -S docker compose down
-# echo sudo docker compose up -d
-# ssh $user@$host
+scp mst-backend.tar.gz $user@$host:/home/$user/
+
+ssh $user@$host -C 'tar xvf mst-backend.tar.gz && cd deploy/ && ./install.sh'
 
diff --git a/backend/deploy/docker-compose.yml b/backend/deploy/docker-compose.yml
index 56b464e..70f7d7f 100644
--- a/backend/deploy/docker-compose.yml
+++ b/backend/deploy/docker-compose.yml
@@ -2,22 +2,12 @@ services:
   backend:
     image: docker.io/sfja/h5-mst-backend:latest
     ports:
-      - "8888:5000"
-  mqtt:
-    image: docker.io/rabbitmq:4.2.5-management
+      - "42069:5000"
+  mosquitto:
+    image: docker.io/eclipse-mosquitto
     ports:
       - "1883:1883"
-      - "5672:5672"
-      - "15672:15672"
-    command: "/bin/bash -c \"rabbitmq-plugins enable --offline rabbitmq_mqtt rabbitmq_web_mqtt rabbitmq_amqp1_0; rabbitmq-server\""
-    environment:
-      RABBITMQ_DEFAULT_USER: devops
-      RABBITMQ_DEFAULT_PASS: Merc1234
     volumes:
-      - rabbitmq_data:/var/lib/rabbitmq
-      - rabbitmq_log:/var/log/rabbitmq
-
-volumes:
-  rabbitmq_data:
-  rabbitmq_log:
+      - $PWD/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - $PWD/mqtt_users:/mosquitto/config/mqtt_users
 
diff --git a/backend/deploy/install.sh b/backend/deploy/install.sh
new file mode 100755
index 0000000..092fc95
--- /dev/null
+++ b/backend/deploy/install.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo docker compose down
+sudo docker compose up -d
+
diff --git a/backend/deploy/mosquitto.conf b/backend/deploy/mosquitto.conf
index e57745d..5839992 100644
--- a/backend/deploy/mosquitto.conf
+++ b/backend/deploy/mosquitto.conf
@@ -1,4 +1,4 @@
 listener 1883
 allow_anonymous true
-password_file mqtt_users
+password_file /mosquitto/config/mqtt_users
 
diff --git a/backend/tests/json.cpp b/backend/tests/json.cpp
new file mode 100644
index 0000000..4fd9d90
--- /dev/null
+++ b/backend/tests/json.cpp
@@ -0,0 +1,16 @@
+#include "../src/json.hpp"
+#include "assertions.h"
+
+namespace json = mst::json;
+
+int main()
+{
+    ASSERT_EQ(**json::parse("null"), *json::Value::make_null());
+    ASSERT_EQ(**json::parse("false"), *json::Value::make_bool(false));
+    ASSERT_EQ(**json::parse("true"), *json::Value::make_bool(true));
+    ASSERT_EQ(**json::parse("0"), *json::Value::make_i64(0));
+    ASSERT_EQ(**json::parse("123"), *json::Value::make_i64(123));
+    ASSERT_EQ(**json::parse("3.14"), *json::Value::make_f64(3.14));
+    ASSERT_EQ(**json::parse("\"hello world\""),
+        *json::Value::make_string("hello world"));
+}