From 815ce3cf24a77f60b5ee66139f03fe928d4e1211 Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Sat, 1 Jan 2022 15:30:39 +0000
Subject: [PATCH 1/3] update compose file and scripts to use mosquitto broker. 
 Includes insecure config file for mosquitto

---
 compose/docker-compose.contained.yml | 11 +++++++++++
 docker/mosquitto.conf                | 10 ++++++++++
 scripts/install-netmaker.sh          |  3 +++
 scripts/nm-quick.sh                  |  4 ++++
 4 files changed, 28 insertions(+)
 create mode 100644 docker/mosquitto.conf

diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml
index aa3ea175..2d2ef308 100644
--- a/compose/docker-compose.contained.yml
+++ b/compose/docker-compose.contained.yml
@@ -68,9 +68,20 @@ services:
       # - $PWD/site:/srv # you could also serve a static site in site folder
       - caddy_data:/data
       - caddy_conf:/config
+  mosquitto:
+    image: eclipse-mosquitto:2.0.14
+    container_name: broker
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - mosquitto_data:/var/lib/mosquitto
+      - mosquitto_logs:/var/log/mosquitto/mosquitto.log
 volumes:
   caddy_data: {}
   caddy_conf: {}
   sqldata: {}
   dnsconfig: {}
+  mosquitto_data: {}
+  mosquitto_logs: {}
 
diff --git a/docker/mosquitto.conf b/docker/mosquitto.conf
new file mode 100644
index 00000000..20ab6597
--- /dev/null
+++ b/docker/mosquitto.conf
@@ -0,0 +1,10 @@
+persitance true
+persistance_location /var/lib/mosquitto/
+
+log_dest_file /var/log/mosquitto/mosquitto.log
+
+per_listener_settings true
+listener 1883
+allow_anonymous true
+bind_interface SERVER_PUBLIC_IP
+
diff --git a/scripts/install-netmaker.sh b/scripts/install-netmaker.sh
index 52232d9a..547dca88 100644
--- a/scripts/install-netmaker.sh
+++ b/scripts/install-netmaker.sh
@@ -136,6 +136,9 @@ echo "Setting Caddyfile..."
 sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/Caddyfile
 sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
 
+echo "Setting Broker..."
+sed -i "s/SERVER_PBLIC_IP/$SERVER_PUBLIC_IP/g" /root/mosquitto.conf
+
 echo "Setting docker-compose..."
 
 sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/docker-compose.yml
diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index 507e6258..8a9bead4 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -135,6 +135,10 @@ wget -q -O /root/Caddyfile https://raw.githubusercontent.com/gravitl/netmaker/ma
 sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/Caddyfile
 sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
 
+echo "setting mosquitto.conf..."
+
+wget -q -O /root/mosquitto.conf https://raw.githubusercontent.com/gravil/netmaker/master/docker/mosquitto.conf
+sed -i "s/SERVER_PUBLIC_IP/$SERVER_PUBLIC_IP/g" /root/mosquitto.conf
 
 echo "setting docker-compose..."
 

From 533965b77b79851e637c8754741dc88e8c9c6145 Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Sat, 1 Jan 2022 15:43:55 +0000
Subject: [PATCH 2/3] fix typo

---
 docker/mosquitto.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/mosquitto.conf b/docker/mosquitto.conf
index 20ab6597..3594af29 100644
--- a/docker/mosquitto.conf
+++ b/docker/mosquitto.conf
@@ -1,4 +1,4 @@
-persitance true
+persistance true
 persistance_location /var/lib/mosquitto/
 
 log_dest_file /var/log/mosquitto/mosquitto.log

From 07bf9252827220eb3c568b8e002f5979b6bcd073 Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Sat, 1 Jan 2022 18:22:06 +0000
Subject: [PATCH 3/3] update mosquitto broker conf and volume info

---
 compose/docker-compose.contained.yml | 4 ++--
 docker/mosquitto.conf                | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml
index 2d2ef308..61512717 100644
--- a/compose/docker-compose.contained.yml
+++ b/compose/docker-compose.contained.yml
@@ -75,8 +75,8 @@ services:
     network_mode: host
     volumes:
       - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
-      - mosquitto_data:/var/lib/mosquitto
-      - mosquitto_logs:/var/log/mosquitto/mosquitto.log
+      - mosquitto_data:/mosquitto/data
+      - mosquitto_logs:/mosquitto/log 
 volumes:
   caddy_data: {}
   caddy_conf: {}
diff --git a/docker/mosquitto.conf b/docker/mosquitto.conf
index 3594af29..85914bad 100644
--- a/docker/mosquitto.conf
+++ b/docker/mosquitto.conf
@@ -1,10 +1,11 @@
-persistance true
-persistance_location /var/lib/mosquitto/
+persistence true
+persistence file mosquitto.db
+persistance_location mosquitto/data
 
-log_dest_file /var/log/mosquitto/mosquitto.log
+log_dest_file mosquitto/log/mosquitto.log
 
 per_listener_settings true
 listener 1883
 allow_anonymous true
-bind_interface SERVER_PUBLIC_IP
+#bind_interface SERVER_PUBLIC_IP