From 36d6adacb401d0bb0caeabf8abef5e7d1b8bf729 Mon Sep 17 00:00:00 2001
From: afeiszli <alex.feiszli@gmail.com>
Date: Tue, 1 Feb 2022 16:25:31 -0500
Subject: [PATCH] updating compose and installer

---
 compose/docker-compose.contained.yml | 10 ++++++----
 docker/mosquitto.conf                |  5 -----
 scripts/install-netmaker.sh          |  3 ---
 scripts/nm-quick.sh                  |  3 +--
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml
index 15a09076..158669a6 100644
--- a/compose/docker-compose.contained.yml
+++ b/compose/docker-compose.contained.yml
@@ -33,6 +33,7 @@ services:
       DISPLAY_KEYS: "on"
       DATABASE: "sqlite"
       NODE_ID: "netmaker-server-1"
+      MQ_HOST: "mq"
       HOST_NETWORK: "off"
       MANAGE_IPTABLES: "on"
       PORT_FORWARD_SERVICES: "dns"
@@ -72,15 +73,16 @@ services:
       # - $PWD/site:/srv # you could also serve a static site in site folder
       - caddy_data:/data
       - caddy_conf:/config
-  mosquitto:
+  mq:
     image: eclipse-mosquitto:2.0.14
-    container_name: broker
+    container_name: mq
     restart: unless-stopped
-    network_mode: host
+    ports:
+      - "1883:1883"
     volumes:
       - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
       - mosquitto_data:/mosquitto/data
-      - mosquitto_logs:/mosquitto/log 
+      - mosquitto_logs:/mosquitto/log
 volumes:
   caddy_data: {}
   caddy_conf: {}
diff --git a/docker/mosquitto.conf b/docker/mosquitto.conf
index dbd3bfac..cb7a060b 100644
--- a/docker/mosquitto.conf
+++ b/docker/mosquitto.conf
@@ -1,10 +1,5 @@
 persistence true
-persistence file mosquitto.db
-persistance_location mosquitto/data
-
-log_dest_file mosquitto/log/mosquitto.log
 
 per_listener_settings true
 listener 1883
 allow_anonymous true
-
diff --git a/scripts/install-netmaker.sh b/scripts/install-netmaker.sh
index 547dca88..52232d9a 100644
--- a/scripts/install-netmaker.sh
+++ b/scripts/install-netmaker.sh
@@ -136,9 +136,6 @@ 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 ebe78b65..80aeb3f2 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -50,7 +50,7 @@ elif [ -f /etc/fedora-release ]; then
 	dnf update
 fi
 
-dependencies=("docker.io" "docker-compose" "wireguard" "jq" "resolvconf")
+dependencies=("docker.io" "docker-compose" "wireguard" "jq" "resolvectl")
 
 
 
@@ -138,7 +138,6 @@ 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..."