From ec51fd2be173e65b8bc494a1ac4934ed896627d5 Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Tue, 19 Apr 2022 10:26:50 -0400
Subject: [PATCH] update compose files to work with cert generation by netmaker

---
 compose/docker-compose.contained.yml | 6 ++++--
 scripts/nm-quick.sh                  | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml
index 63d4862a..d7d44c80 100644
--- a/compose/docker-compose.contained.yml
+++ b/compose/docker-compose.contained.yml
@@ -7,7 +7,7 @@ services:
     volumes:
       - dnsconfig:/root/config/dnsconfig
       - sqldata:/root/data
-      - /root/certs/:/etc/netmaker/
+      - /etc/netmaker/:/etc/netmaker/
     cap_add: 
       - NET_ADMIN
       - NET_RAW
@@ -76,6 +76,8 @@ services:
       - caddy_conf:/config
   mq:
     image: eclipse-mosquitto:2.0.11-openssl
+    depends_on:
+      - netmaker
     container_name: mq
     restart: unless-stopped
     ports:
@@ -83,7 +85,7 @@ services:
       - "8883:8883"
     volumes:
       - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
-      - /root/certs:/mosquitto/certs/
+      - /etc/netmaker:/mosquitto/certs/
       - mosquitto_data:/mosquitto/data
       - mosquitto_logs:/mosquitto/log
 volumes:
diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index c583d66c..a553d73b 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -139,6 +139,8 @@ wget -q -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmak
 
 echo "setting docker-compose..."
 
+mkdir -p /etc/netmaker
+
 wget -q -O /root/docker-compose.yml https://raw.githubusercontent.com/gravitl/netmaker/master/compose/docker-compose.contained.yml
 sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/docker-compose.yml
 sed -i "s/SERVER_PUBLIC_IP/$SERVER_PUBLIC_IP/g" /root/docker-compose.yml