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
83da01a2
Unverified
Commit
83da01a2
authored
Apr 10, 2022
by
neil
Committed by
GitHub
Apr 10, 2022
Browse files
Merge pull request #4027 from acmesh-official/dev
sync
parents
dcbbee8a
7cd6ff05
Changes
4
Show whitespace changes
Inline
Side-by-side
.github/FUNDING.yml
View file @
83da01a2
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
github
:
# Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
github
:
# Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon
:
# Replace with a single Patreon username
patreon
:
# Replace with a single Patreon username
open_collective
:
acmesh
open_collective
:
acmesh
ko_fi
:
# Replace with a single Ko-fi username
ko_fi
:
neilpang
tidelift
:
# Replace with a single Tidelift platform-name/package-name e.g., npm/babel
tidelift
:
# Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge
:
# Replace with a single Community Bridge project-name e.g., cloud-foundry
community_bridge
:
# Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay
:
# Replace with a single Liberapay username
liberapay
:
# Replace with a single Liberapay username
...
...
acme.sh
View file @
83da01a2
...
@@ -4317,6 +4317,13 @@ issue() {
...
@@ -4317,6 +4317,13 @@ issue() {
Le_NextRenewTime
=
$(
_readdomainconf Le_NextRenewTime
)
Le_NextRenewTime
=
$(
_readdomainconf Le_NextRenewTime
)
_debug Le_NextRenewTime
"
$Le_NextRenewTime
"
_debug Le_NextRenewTime
"
$Le_NextRenewTime
"
if
[
-z
"
$FORCE
"
]
&&
[
"
$Le_NextRenewTime
"
]
&&
[
"
$(
_time
)
"
-lt
"
$Le_NextRenewTime
"
]
;
then
if
[
-z
"
$FORCE
"
]
&&
[
"
$Le_NextRenewTime
"
]
&&
[
"
$(
_time
)
"
-lt
"
$Le_NextRenewTime
"
]
;
then
_valid_to_saved
=
$(
_readdomainconf Le_Valid_to
)
if
[
"
$_valid_to_saved
"
]
&&
!
_startswith
"
$_valid_to_saved
"
"+"
;
then
_info
"The domain is set to be valid to:
$_valid_to_saved
"
_info
"It can not be renewed automatically"
_info
"See:
$_VALIDITY_WIKI
"
return
$RENEW_SKIP
fi
_saved_domain
=
$(
_readdomainconf Le_Domain
)
_saved_domain
=
$(
_readdomainconf Le_Domain
)
_debug _saved_domain
"
$_saved_domain
"
_debug _saved_domain
"
$_saved_domain
"
_saved_alt
=
$(
_readdomainconf Le_Alt
)
_saved_alt
=
$(
_readdomainconf Le_Alt
)
...
@@ -5187,6 +5194,11 @@ $_authorizations_map"
...
@@ -5187,6 +5194,11 @@ $_authorizations_map"
if
[
"
$_notAfter
"
]
;
then
if
[
"
$_notAfter
"
]
;
then
Le_NextRenewTime
=
$(
_date2time
"
$_notAfter
"
)
Le_NextRenewTime
=
$(
_date2time
"
$_notAfter
"
)
Le_NextRenewTimeStr
=
"
$_notAfter
"
Le_NextRenewTimeStr
=
"
$_notAfter
"
if
[
"
$_valid_to
"
]
&&
!
_startswith
"
$_valid_to
"
"+"
;
then
_info
"The domain is set to be valid to:
$_valid_to
"
_info
"It can not be renewed automatically"
_info
"See:
$_VALIDITY_WIKI
"
fi
else
else
Le_NextRenewTime
=
$(
_math
"
$Le_CertCreateTime
"
+
"
$Le_RenewalDays
"
\*
24
\*
60
\*
60
)
Le_NextRenewTime
=
$(
_math
"
$Le_CertCreateTime
"
+
"
$Le_RenewalDays
"
\*
24
\*
60
\*
60
)
Le_NextRenewTimeStr
=
$(
_time2str
"
$Le_NextRenewTime
"
)
Le_NextRenewTimeStr
=
$(
_time2str
"
$Le_NextRenewTime
"
)
...
@@ -5258,6 +5270,25 @@ renew() {
...
@@ -5258,6 +5270,25 @@ renew() {
Le_API
=
"
$CA_LETSENCRYPT_V2
"
Le_API
=
"
$CA_LETSENCRYPT_V2
"
fi
fi
#revert from staging CAs back to production CAs
if
[
-z
"
$ACME_DIRECTORY
"
]
;
then
case
"
$Le_API
"
in
"
$CA_LETSENCRYPT_V2_TEST
"
)
_info
"Switching back to
$CA_LETSENCRYPT_V2
"
Le_API
=
"
$CA_LETSENCRYPT_V2
"
;;
"
$CA_BUYPASS_TEST
"
)
_info
"Switching back to
$CA_BUYPASS
"
Le_API
=
"
$CA_BUYPASS
"
;;
"
$CA_GOOGLE_TEST
"
)
_info
"Switching back to
$CA_GOOGLE
"
Le_API
=
"
$CA_GOOGLE
"
;;
esac
fi
if
[
"
$Le_API
"
]
;
then
if
[
"
$Le_API
"
]
;
then
if
[
"
$Le_API
"
!=
"
$ACME_DIRECTORY
"
]
;
then
if
[
"
$Le_API
"
!=
"
$ACME_DIRECTORY
"
]
;
then
_clearAPI
_clearAPI
...
...
dnsapi/dns_ispconfig.sh
View file @
83da01a2
...
@@ -32,7 +32,7 @@ dns_ispconfig_rm() {
...
@@ -32,7 +32,7 @@ dns_ispconfig_rm() {
#################### Private functions below ##################################
#################### Private functions below ##################################
_ISPC_credentials
()
{
_ISPC_credentials
()
{
if
[
-z
"
${
ISPC_User
}
"
]
||
[
-z
"
$ISPC_Password
"
]
||
[
-z
"
${
ISPC_Api
}
"
]
||
[
-z
"
${
ISPC_Api_Insecure
}
"
]
;
then
if
[
-z
"
${
ISPC_User
}
"
]
||
[
-z
"
$
{
ISPC_Password
}
"
]
||
[
-z
"
${
ISPC_Api
}
"
]
||
[
-z
"
${
ISPC_Api_Insecure
}
"
]
;
then
ISPC_User
=
""
ISPC_User
=
""
ISPC_Password
=
""
ISPC_Password
=
""
ISPC_Api
=
""
ISPC_Api
=
""
...
...
dnsapi/dns_netlify.sh
View file @
83da01a2
...
@@ -114,7 +114,7 @@ _get_root() {
...
@@ -114,7 +114,7 @@ _get_root() {
fi
fi
if
_contains
"
$response
"
"
\"
name
\"
:
\"
$h
\"
"
>
/dev/null
;
then
if
_contains
"
$response
"
"
\"
name
\"
:
\"
$h
\"
"
>
/dev/null
;
then
_domain_id
=
$(
echo
"
$response
"
| _egrep_o
"
\"
[^
\"
]*
\"
,
\"
name
\"
:
\"
$h
"
|
cut
-d
,
-f
1 |
tr
-d
\"
)
_domain_id
=
$(
echo
"
$response
"
| _egrep_o
"
\"
[^
\"
]*
\"
,
\"
name
\"
:
\"
$h
\"
"
|
cut
-d
,
-f
1 |
tr
-d
\"
)
if
[
"
$_domain_id
"
]
;
then
if
[
"
$_domain_id
"
]
;
then
if
[
"
$i
"
=
1
]
;
then
if
[
"
$i
"
=
1
]
;
then
#create the record at the domain apex (@) if only the domain name was provided as --domain-alias
#create the record at the domain apex (@) if only the domain name was provided as --domain-alias
...
...
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