diff --git a/start.letsencrypt.sh b/start.letsencrypt.sh index d1daaa8..0bf3f1a 100755 --- a/start.letsencrypt.sh +++ b/start.letsencrypt.sh @@ -12,7 +12,14 @@ start_letsencrypt() { mkdir -p /acme.sh/$DOMAIN/ ; /usr/local/bin/acme.sh -m $email --issue --standalone --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 - + + # Check certificate issuer + ISSUER=$(openssl x509 -in /etc/ssl/keys/launchpad.staging.galaxis.xyz/fullchain.pem -text -noout |grep -w CN |grep Issuer | cut -d '=' -f2); + SUBJECT=$(openssl x509 -in /etc/ssl/keys/launchpad.staging.galaxis.xyz/fullchain.pem -text -noout |grep -w CN |grep Subject | cut -d '=' -f2); + if [ "$ISSUER" == "$SUBJECT" ]; then + echo "Self signed certificate found"; + /usr/local/bin/acme.sh -m $email --force --issue --standalone --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 + fi } LETSENCRYPT_FILE=$(find /acme.sh/ -type f -name letsencrypt); @@ -26,7 +33,7 @@ if [ -n "$LETSENCRYPT_FILE" ] ; then if [[ -f /acme.sh/$DOMAIN/key.pem && -f /acme.sh/$DOMAIN/fullchain.pem && -f /acme.sh/$DOMAIN/cert.pem ]] ; then if [[ "$(date -r /acme.sh/$DOMAIN/key.pem +%y%m%d%H)" -ge "$DATE" && "$(date -r /acme.sh/$DOMAIN/fullchain.pem +%y%m%d%H)" -ge "$DATE" && "$(date -r /acme.sh/$DOMAIN/cert.pem +%y%m%d%H)" -ge "$DATE" ]] ; then - + touch /acme.sh/$DOMAIN/new_certificate; else sending_error_msg $DOMAIN $DATE;