mirror of
https://github.com/gravitl/netmaker.git
synced 2025-09-10 15:14:22 +08:00
updating installer for longer cert duration
This commit is contained in:
parent
a6a16cf934
commit
6e41d59e13
2 changed files with 7 additions and 8 deletions
|
@ -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/REPLACE_MQ_ADMIN_PASSWORD/$MQ_PASSWORD/g" /root/docker-compose.yml
|
||||
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
|
||||
echo "Starting containers..."
|
||||
|
||||
|
@ -326,11 +325,11 @@ sleep 2
|
|||
test_connection() {
|
||||
|
||||
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
|
||||
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 " Exiting..."
|
||||
exit 1
|
||||
|
|
|
@ -149,13 +149,13 @@ docker-compose -f /root/docker-compose.yml up -d
|
|||
|
||||
test_connection() {
|
||||
|
||||
echo "testing Traefik setup (please be patient, this may take 1-2 minutes)"
|
||||
for i in 1 2 3 4 5 6
|
||||
echo "testing Caddy setup (please be patient, this may take 1-2 minutes)"
|
||||
for i in 1 2 3 4 5 6 7 8
|
||||
do
|
||||
curlresponse=$(curl -vIs https://api.${NETMAKER_BASE_DOMAIN} 2>&1)
|
||||
|
||||
if [[ "$i" == 6 ]]; then
|
||||
echo " Traefik is having an issue setting up certificates, please investigate (docker logs traefik)"
|
||||
if [[ "$i" == 8 ]]; then
|
||||
echo " Caddy is having an issue setting up certificates, please investigate (docker logs caddy)"
|
||||
echo " exiting..."
|
||||
exit 1
|
||||
elif [[ "$curlresponse" == *"failed to verify the legitimacy of the server"* ]]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue