|
@@ -314,8 +314,7 @@ sed -i "s/REPLACE_MASTER_KEY/$MASTER_KEY/g" /root/docker-compose.yml
|
|
sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
|
|
sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
|
|
sed -i "s/REPLACE_MQ_ADMIN_PASSWORD/$MQ_PASSWORD/g" /root/docker-compose.yml
|
|
sed -i "s/REPLACE_MQ_ADMIN_PASSWORD/$MQ_PASSWORD/g" /root/docker-compose.yml
|
|
if [ "$INSTALL_TYPE" = "ee" ]; then
|
|
if [ "$INSTALL_TYPE" = "ee" ]; then
|
|
- sed -i "s~YOUR_LICENSE_KEY~$LICENSE_KEY~g" /root/docker-compose.yml
|
|
|
|
- sed -i "s/YOUR_ACCOUNT_ID/$ACCOUNT_ID/g" /root/docker-compose.yml
|
|
|
|
|
|
+
|
|
fi
|
|
fi
|
|
echo "Starting containers..."
|
|
echo "Starting containers..."
|
|
|
|
|
|
@@ -326,11 +325,11 @@ sleep 2
|
|
test_connection() {
|
|
test_connection() {
|
|
|
|
|
|
echo "Testing Caddy setup (please be patient, this may take 1-2 minutes)"
|
|
echo "Testing Caddy setup (please be patient, this may take 1-2 minutes)"
|
|
-for i in 1 2 3 4 5 6
|
|
|
|
|
|
+for i in 1 2 3 4 5 6 7 8
|
|
do
|
|
do
|
|
curlresponse=$(curl -vIs https://api.${NETMAKER_BASE_DOMAIN} 2>&1)
|
|
curlresponse=$(curl -vIs https://api.${NETMAKER_BASE_DOMAIN} 2>&1)
|
|
|
|
|
|
-if [[ "$i" == 6 ]]; then
|
|
|
|
|
|
+if [[ "$i" == 8 ]]; then
|
|
echo " Caddy is having an issue setting up certificates, please investigate (docker logs caddy)"
|
|
echo " Caddy is having an issue setting up certificates, please investigate (docker logs caddy)"
|
|
echo " Exiting..."
|
|
echo " Exiting..."
|
|
exit 1
|
|
exit 1
|