|
@@ -250,7 +250,7 @@ If you enter '.', the field will be left blank.
|
|
|
fi
|
|
|
done
|
|
|
[ "${moredomainame_flag}" == 'y' ] && moredomainame_D="$(for D in ${moredomainame}; do echo -d ${D}; done)"
|
|
|
- ~/.acme.sh/acme.sh --issue --dns dns_${DNS_PRO} -d ${domain} ${moredomainame_D}
|
|
|
+ ~/.acme.sh/acme.sh --force --issue --dns dns_${DNS_PRO} -d ${domain} ${moredomainame_D}
|
|
|
else
|
|
|
if [ "${nginx_ssl_flag}" == 'y' ]; then
|
|
|
[ ! -d ${web_install_dir}/conf/vhost ] && mkdir ${web_install_dir}/conf/vhost
|
|
@@ -287,7 +287,7 @@ EOF
|
|
|
done
|
|
|
rm -f ${vhostdir}/${auth_file}
|
|
|
[ "${moredomainame_flag}" == 'y' ] && moredomainame_D="$(for D in ${moredomainame}; do echo -d ${D}; done)"
|
|
|
- ~/.acme.sh/acme.sh --issue -d ${domain} ${moredomainame_D} -w ${vhostdir}
|
|
|
+ ~/.acme.sh/acme.sh --force --issue -d ${domain} ${moredomainame_D} -w ${vhostdir}
|
|
|
fi
|
|
|
if [ -s ~/.acme.sh/${domain}/fullchain.cer ]; then
|
|
|
[ -e "${PATH_SSL}/${domain}.crt" ] && rm -f ${PATH_SSL}/${domain}.{crt,key}
|
|
@@ -300,7 +300,7 @@ EOF
|
|
|
elif [ ! -e "${web_install_dir}/sbin/nginx" -a -e "${apache_install_dir}/bin/httpd" ]; then
|
|
|
Command="${Apache_cmd}"
|
|
|
fi
|
|
|
- ~/.acme.sh/acme.sh --install-cert -d ${domain} --fullchain-file ${PATH_SSL}/${domain}.crt --key-file ${PATH_SSL}/${domain}.key --reloadcmd "${Command}" > /dev/null
|
|
|
+ ~/.acme.sh/acme.sh --force --install-cert -d ${domain} --fullchain-file ${PATH_SSL}/${domain}.crt --key-file ${PATH_SSL}/${domain}.key --reloadcmd "${Command}" > /dev/null
|
|
|
else
|
|
|
echo "${CFAILURE}Error: Create Let's Encrypt SSL Certificate failed! ${CEND}"
|
|
|
[ -e "${web_install_dir}/conf/vhost/${domain}.conf" ] && rm -f ${web_install_dir}/conf/vhost/${domain}.conf
|
|
@@ -1047,7 +1047,7 @@ Del_NGX_Vhost() {
|
|
|
rm -rf ${Directory}
|
|
|
fi
|
|
|
echo
|
|
|
- [ -d ~/.acme.sh/${domain} ] && ~/.acme.sh/acme.sh --remove -d ${domain} > /dev/null 2>&1
|
|
|
+ [ -d ~/.acme.sh/${domain} ] && ~/.acme.sh/acme.sh --force --remove -d ${domain} > /dev/null 2>&1
|
|
|
echo "${CMSG}Domain: ${domain} has been deleted.${CEND}"
|
|
|
echo
|
|
|
else
|
|
@@ -1099,7 +1099,7 @@ Del_Apache_Vhost() {
|
|
|
fi
|
|
|
rm -rf ${Directory}
|
|
|
fi
|
|
|
- [ -d ~/.acme.sh/${domain} ] && ~/.acme.sh/acme.sh --remove -d ${domain} > /dev/null 2>&1
|
|
|
+ [ -d ~/.acme.sh/${domain} ] && ~/.acme.sh/acme.sh --force --remove -d ${domain} > /dev/null 2>&1
|
|
|
echo "${CSUCCESS}Domain: ${domain} has been deleted.${CEND}"
|
|
|
else
|
|
|
echo "${CWARNING}Virtualhost: ${domain} was not exist! ${CEND}"
|