Browse Source

fixed local install

Tobias Cudnik 2 years ago
parent
commit
ffbe80cceb
2 changed files with 4 additions and 2 deletions
  1. 2 2
      scripts/nm-certs.sh
  2. 2 0
      scripts/nm-quick.sh

+ 2 - 2
scripts/nm-certs.sh

@@ -83,8 +83,8 @@ if [ ! -f "$CERT_DIR"/fullchain.pem ]; then
 fi
 
 # copy for mounting
-cp "$CERT_DIR"/fullchain.pem /root
-cp "$CERT_DIR"/privkey.pem /root
+cp -L "$CERT_DIR"/fullchain.pem /root/fullchain.pem
+cp -L "$CERT_DIR"/privkey.pem /root/privkey.pem
 
 echo "SSL certificates ready"
 

+ 2 - 0
scripts/nm-quick.sh

@@ -270,6 +270,7 @@ local_install_setup() { (
 		cp compose/docker-compose.yml /root/docker-compose.yml
 		cp docker/Caddyfile /root/Caddyfile
 	fi
+	cp scripts/nm-certs.sh /root/nm-certs.sh
 	cp docker/mosquitto.conf /root/mosquitto.conf
 	cp docker/wait.sh /root/wait.sh
 	cd ../../
@@ -621,6 +622,7 @@ install_netmaker() {
 
 	wait_seconds 3
 
+	# TODO extract wgets to setup(), mirror local_setup()
 	echo "Pulling config files..."
 
 	COMPOSE_URL="https://raw.githubusercontent.com/gravitl/netmaker/$BUILD_TAG/compose/docker-compose.yml"