Browse Source

Fixed dnssleep parametr - and added to renew conf file

pull/207/head
Pavel Ondřej 9 years ago
parent
commit
d9f0ec9940
  1. 12
      acme.sh

12
acme.sh

@ -1105,6 +1105,7 @@ issue() {
Le_RealCACertPath="$7" Le_RealCACertPath="$7"
Le_ReloadCmd="$8" Le_ReloadCmd="$8"
Le_RealFullChainPath="$9" Le_RealFullChainPath="$9"
dnssleep="${10}"
#remove these later. #remove these later.
if [ "$Le_Webroot" = "dns-cf" ] ; then if [ "$Le_Webroot" = "dns-cf" ] ; then
@ -1620,7 +1621,7 @@ renew() {
fi fi
IS_RENEW="1" IS_RENEW="1"
issue "$Le_Webroot" "$Le_Domain" "$Le_Alt" "$Le_Keylength" "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath"
issue "$Le_Webroot" "$Le_Domain" "$Le_Alt" "$Le_Keylength" "$Le_RealCertPath" "$Le_RealKeyPath" "$Le_RealCACertPath" "$Le_ReloadCmd" "$Le_RealFullChainPath" "$dnssleep"
local res=$? local res=$?
IS_RENEW="" IS_RENEW=""
@ -2164,7 +2165,7 @@ Parameters:
--standalone Use standalone mode. --standalone Use standalone mode.
--apache Use apache mode. --apache Use apache mode.
--dns [dns_cf|dns_dp|dns_cx|/path/to/api/file] Use dns mode or dns api. --dns [dns_cf|dns_dp|dns_cx|/path/to/api/file] Use dns mode or dns api.
--dnssleep # Number of seconds for sleep (for reload dns cache etc.), after succesful insert dns records via dns api.
--dnssleep Number of seconds for sleep (for reload dns cache etc.), after succesful insert dns records via dns api.
--keylength, -k [2048] Specifies the domain key length: 2048, 3072, 4096, 8192 or ec-256, ec-384. --keylength, -k [2048] Specifies the domain key length: 2048, 3072, 4096, 8192 or ec-256, ec-384.
--accountkeylength, -ak [2048] Specifies the account key length. --accountkeylength, -ak [2048] Specifies the account key length.
@ -2235,6 +2236,7 @@ _process() {
_accountkey="" _accountkey=""
_certhome="" _certhome=""
_httpport="" _httpport=""
dnssleep="60"
while [ ${#} -gt 0 ] ; do while [ ${#} -gt 0 ] ; do
case "${1}" in case "${1}" in
@ -2361,9 +2363,9 @@ _process() {
_webroot="$_webroot,$wvalue" _webroot="$_webroot,$wvalue"
fi fi
;; ;;
--dnssleep
--dnssleep)
re='^[0-9]+$' re='^[0-9]+$'
if ! [[ $2 =~ $re ]] ; then
if ! [[ "$2" =~ $re ]] ; then
dnssleep="60" dnssleep="60"
else else
dnssleep="$2" dnssleep="$2"
@ -2457,7 +2459,7 @@ _process() {
install) install ;; install) install ;;
uninstall) uninstall ;; uninstall) uninstall ;;
issue) issue)
issue "$_webroot" "$_domain" "$_altdomains" "$_keylength" "$_certpath" "$_keypath" "$_capath" "$_reloadcmd" "$_fullchainpath"
issue "$_webroot" "$_domain" "$_altdomains" "$_keylength" "$_certpath" "$_keypath" "$_capath" "$_reloadcmd" "$_fullchainpath" "$dnssleep"
;; ;;
installcert) installcert)
installcert "$_domain" "$_certpath" "$_keypath" "$_capath" "$_reloadcmd" "$_fullchainpath" installcert "$_domain" "$_certpath" "$_keypath" "$_capath" "$_reloadcmd" "$_fullchainpath"

Loading…
Cancel
Save