Enhance certificate issuance logic in start.letsencrypt.sh to handle unissued domains and improve renew command flow
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -65,8 +65,16 @@ start_letsencrypt() {
|
|||||||
if [ "$ISSUER" == "$SUBJECT" ]; then
|
if [ "$ISSUER" == "$SUBJECT" ]; then
|
||||||
echo "Self signed certificate found"
|
echo "Self signed certificate found"
|
||||||
sh /acme.sh/acme.sh $L_S $EK $EHK --issue --standalone --config-home /acme.sh --keylength 4096 -d $DOMAIN --cert-file /acme.sh/$DOMAIN/cert.pem --key-file /acme.sh/$DOMAIN/key.pem --fullchain-file /acme.sh/$DOMAIN/fullchain.pem >$LOG_FILE 2>&1
|
sh /acme.sh/acme.sh $L_S $EK $EHK --issue --standalone --config-home /acme.sh --keylength 4096 -d $DOMAIN --cert-file /acme.sh/$DOMAIN/cert.pem --key-file /acme.sh/$DOMAIN/key.pem --fullchain-file /acme.sh/$DOMAIN/fullchain.pem >$LOG_FILE 2>&1
|
||||||
else
|
else
|
||||||
|
VAR=""
|
||||||
|
SUCCESS=""
|
||||||
sh /acme.sh/acme.sh $L_S $EK $EHK --renew --standalone --config-home /acme.sh --keylength 4096 -d $DOMAIN --cert-file /acme.sh/$DOMAIN/cert.pem --key-file /acme.sh/$DOMAIN/key.pem --fullchain-file /acme.sh/$DOMAIN/fullchain.pem >$LOG_FILE 2>&1
|
sh /acme.sh/acme.sh $L_S $EK $EHK --renew --standalone --config-home /acme.sh --keylength 4096 -d $DOMAIN --cert-file /acme.sh/$DOMAIN/cert.pem --key-file /acme.sh/$DOMAIN/key.pem --fullchain-file /acme.sh/$DOMAIN/fullchain.pem >$LOG_FILE 2>&1
|
||||||
|
|
||||||
|
VAR=$(echo "'$DOMAIN' is not an issued domain, skipping")
|
||||||
|
SUCCESS=$(cat $LOG_FILE | |grep -Fi "$VAR")
|
||||||
|
if [ "$SUCCESS" != "" ]; then
|
||||||
|
sh /acme.sh/acme.sh $L_S $EK $EHK --issue --standalone --config-home /acme.sh --keylength 4096 -d $DOMAIN --cert-file /acme.sh/$DOMAIN/cert.pem --key-file /acme.sh/$DOMAIN/key.pem --fullchain-file /acme.sh/$DOMAIN/fullchain.pem >$LOG_FILE 2>&1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
sh /acme.sh/acme.sh $L_S $EK $EHK --issue --standalone --config-home /acme.sh --keylength 4096 -d $DOMAIN --cert-file /acme.sh/$DOMAIN/cert.pem --key-file /acme.sh/$DOMAIN/key.pem --fullchain-file /acme.sh/$DOMAIN/fullchain.pem >$LOG_FILE 2>&1
|
sh /acme.sh/acme.sh $L_S $EK $EHK --issue --standalone --config-home /acme.sh --keylength 4096 -d $DOMAIN --cert-file /acme.sh/$DOMAIN/cert.pem --key-file /acme.sh/$DOMAIN/key.pem --fullchain-file /acme.sh/$DOMAIN/fullchain.pem >$LOG_FILE 2>&1
|
||||||
|
|||||||
Reference in New Issue
Block a user