Browse Source

update compose files to work with cert generation by netmaker

Matthew R. Kasun 3 years ago
parent
commit
ec51fd2be1
2 changed files with 6 additions and 2 deletions
  1. 4 2
      compose/docker-compose.contained.yml
  2. 2 0
      scripts/nm-quick.sh

+ 4 - 2
compose/docker-compose.contained.yml

@@ -7,7 +7,7 @@ services:
     volumes:
     volumes:
       - dnsconfig:/root/config/dnsconfig
       - dnsconfig:/root/config/dnsconfig
       - sqldata:/root/data
       - sqldata:/root/data
-      - /root/certs/:/etc/netmaker/
+      - /etc/netmaker/:/etc/netmaker/
     cap_add: 
     cap_add: 
       - NET_ADMIN
       - NET_ADMIN
       - NET_RAW
       - NET_RAW
@@ -76,6 +76,8 @@ services:
       - caddy_conf:/config
       - caddy_conf:/config
   mq:
   mq:
     image: eclipse-mosquitto:2.0.11-openssl
     image: eclipse-mosquitto:2.0.11-openssl
+    depends_on:
+      - netmaker
     container_name: mq
     container_name: mq
     restart: unless-stopped
     restart: unless-stopped
     ports:
     ports:
@@ -83,7 +85,7 @@ services:
       - "8883:8883"
       - "8883:8883"
     volumes:
     volumes:
       - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
       - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
-      - /root/certs:/mosquitto/certs/
+      - /etc/netmaker:/mosquitto/certs/
       - mosquitto_data:/mosquitto/data
       - mosquitto_data:/mosquitto/data
       - mosquitto_logs:/mosquitto/log
       - mosquitto_logs:/mosquitto/log
 volumes:
 volumes:

+ 2 - 0
scripts/nm-quick.sh

@@ -139,6 +139,8 @@ wget -q -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmak
 
 
 echo "setting docker-compose..."
 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
 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/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
 sed -i "s/SERVER_PUBLIC_IP/$SERVER_PUBLIC_IP/g" /root/docker-compose.yml