Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
db3264ab
Unverified
Commit
db3264ab
authored
Mar 21, 2018
by
neil
Committed by
GitHub
Mar 21, 2018
Browse files
Merge pull request #1427 from Neilpang/dev
sync
parents
43e9553e
a0923622
Changes
2
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
db3264ab
...
@@ -110,10 +110,14 @@ _STATELESS_WIKI="https://github.com/Neilpang/acme.sh/wiki/Stateless-Mode"
...
@@ -110,10 +110,14 @@ _STATELESS_WIKI="https://github.com/Neilpang/acme.sh/wiki/Stateless-Mode"
_DNS_ALIAS_WIKI
=
"https://github.com/Neilpang/acme.sh/wiki/DNS-alias-mode"
_DNS_ALIAS_WIKI
=
"https://github.com/Neilpang/acme.sh/wiki/DNS-alias-mode"
_DNS_MANUAL_WIKI
=
"https://github.com/Neilpang/acme.sh/wiki/dns-manual-mode"
_DNS_MANUAL_ERR
=
"The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead."
_DNS_MANUAL_ERR
=
"The dns manual mode can not renew automatically, you must issue it again manually. You'd better use the other modes instead."
_DNS_MANUAL_WARN
=
"It seems that you are using dns manual mode. please take care:
$_DNS_MANUAL_ERR
"
_DNS_MANUAL_WARN
=
"It seems that you are using dns manual mode. please take care:
$_DNS_MANUAL_ERR
"
_DNS_MANUAL_ERROR
=
"It seems that you are using dns manual mode. Read this link first:
$_DNS_MANUAL_WIKI
"
__INTERACTIVE
=
""
__INTERACTIVE
=
""
if
[
-t
1
]
;
then
if
[
-t
1
]
;
then
__INTERACTIVE
=
"1"
__INTERACTIVE
=
"1"
...
@@ -3477,6 +3481,11 @@ issue() {
...
@@ -3477,6 +3481,11 @@ issue() {
mkdir
-p
"
$DOMAIN_PATH
"
mkdir
-p
"
$DOMAIN_PATH
"
fi
fi
if
_hasfield
"
$_web_roots
"
"
$W_DNS
"
&&
[
-z
"
$FORCE_DNS_MANUAL
"
]
;
then
_err
"
$_DNS_MANUAL_ERROR
"
return
1
fi
_debug
"Using ACME_DIRECTORY:
$ACME_DIRECTORY
"
_debug
"Using ACME_DIRECTORY:
$ACME_DIRECTORY
"
_initAPI
_initAPI
...
@@ -4100,13 +4109,15 @@ $_authorizations_map"
...
@@ -4100,13 +4109,15 @@ $_authorizations_map"
fi
fi
if
[
"
$code
"
!=
"200"
]
;
then
if
[
"
$code
"
!=
"200"
]
;
then
_err
"Sign failed, code is not 200."
_err
"Sign failed, code is not 200."
_err
"
$response
"
_on_issue_err
"
$_post_hook
"
_on_issue_err
"
$_post_hook
"
return
1
return
1
fi
fi
Le_LinkCert
=
"
$(
echo
"
$response
"
|
tr
-d
'\r\n'
| _egrep_o
'"certificate" *: *"[^"]*"'
|
cut
-d
'"'
-f
4
)
"
Le_LinkCert
=
"
$(
echo
"
$response
"
|
tr
-d
'\r\n'
| _egrep_o
'"certificate" *: *"[^"]*"'
|
cut
-d
'"'
-f
4
)
"
if
!
_get
"
$Le_LinkCert
"
>
"
$CERT_PATH
"
;
then
if
!
_get
"
$Le_LinkCert
"
>
"
$CERT_PATH
"
;
then
_err
"Sign failed, code is not 200."
_err
"Sign failed, can not download cert:
$Le_LinkCert
."
_err
"
$response
"
_on_issue_err
"
$_post_hook
"
_on_issue_err
"
$_post_hook
"
return
1
return
1
fi
fi
...
@@ -5498,6 +5509,7 @@ Parameters:
...
@@ -5498,6 +5509,7 @@ Parameters:
--listen-v6 Force standalone/tls server to listen at ipv6.
--listen-v6 Force standalone/tls server to listen at ipv6.
--openssl-bin Specifies a custom openssl bin location.
--openssl-bin Specifies a custom openssl bin location.
--use-wget Force to use wget, if you have both curl and wget installed.
--use-wget Force to use wget, if you have both curl and wget installed.
--yes-I-know-dns-manual-mode-enough-go-ahead-please Force to use dns manual mode:
$_DNS_MANUAL_WIKI
"
"
}
}
...
@@ -5986,6 +5998,9 @@ _process() {
...
@@ -5986,6 +5998,9 @@ _process() {
shift
shift
fi
fi
;;
;;
--yes-I-know-dns-manual-mode-enough-go-ahead-please
)
export
FORCE_DNS_MANUAL
=
1
;;
--log
|
--logfile
)
--log
|
--logfile
)
_log
=
"1"
_log
=
"1"
_logfile
=
"
$2
"
_logfile
=
"
$2
"
...
...
dnsapi/dns_freedns.sh
View file @
db3264ab
...
@@ -279,7 +279,7 @@ _freedns_add_txt_record() {
...
@@ -279,7 +279,7 @@ _freedns_add_txt_record() {
domain_id
=
"
$2
"
domain_id
=
"
$2
"
subdomain
=
"
$3
"
subdomain
=
"
$3
"
value
=
"
$(
printf
'%s'
"
$4
"
| _url_encode
)
"
value
=
"
$(
printf
'%s'
"
$4
"
| _url_encode
)
"
url
=
"http://freedns.afraid.org/subdomain/save.php?step=2"
url
=
"http
s
://freedns.afraid.org/subdomain/save.php?step=2"
htmlpage
=
"
$(
_post
"type=TXT&domain_id=
$domain_id
&subdomain=
$subdomain
&address=%22
$value
%22&send=Save%21"
"
$url
"
)
"
htmlpage
=
"
$(
_post
"type=TXT&domain_id=
$domain_id
&subdomain=
$subdomain
&address=%22
$value
%22&send=Save%21"
"
$url
"
)
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment