curl follow Gitlab redirect, silent deploy, better status message

Jochen Sprickerhof
2019-08-11 10:41:49 +02:00
parent 4f2efc5936
commit 0bfacedc96
+3 -3
@@ -27,8 +27,8 @@ deploy_challenge() {
git -C "$REPO" commit -m "Let's Encrypt challenge" git -C "$REPO" commit -m "Let's Encrypt challenge"
git -C "$REPO" push git -C "$REPO" push
sleep 20 sleep 20
while ! curl --output /dev/null --silent --head --fail "https://$DOMAIN/.well-known/acme-challenge/$TOKEN_FILENAME"; do while ! curl --output /dev/null --silent --head --location --fail "https://$DOMAIN/.well-known/acme-challenge/$TOKEN_FILENAME"; do
echo sleeping echo "Waiting for challenge to be deployed"
sleep 5 sleep 5
done done
} }
@@ -45,7 +45,7 @@ deploy_cert() {
DOMAIN="$1" DOMAIN="$1"
KEYFILE="$2" KEYFILE="$2"
FULLCHAINFILE="$4" FULLCHAINFILE="$4"
curl --request PUT --header "PRIVATE-TOKEN: $TOKEN" --form "certificate=@$FULLCHAINFILE" --form "key=@$KEYFILE" "https://gitlab.com/api/v4/projects/$PROJECT/pages/domains/$DOMAIN" curl --output /dev/null --silent --fail --request PUT --header "PRIVATE-TOKEN: $TOKEN" --form "certificate=@$FULLCHAINFILE" --form "key=@$KEYFILE" "https://gitlab.com/api/v4/projects/$PROJECT/pages/domains/$DOMAIN"
} }
HANDLER="$1"; shift HANDLER="$1"; shift