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
66a68edb
Unverified
Commit
66a68edb
authored
Jul 30, 2023
by
Martin Arndt
Committed by
GitHub
Jul 30, 2023
Browse files
Merge branch 'acmesh-official:master' into master
parents
80006f47
0da839cc
Changes
5
Hide whitespace changes
Inline
Side-by-side
.github/workflows/DragonFlyBSD.yml
View file @
66a68edb
...
...
@@ -62,7 +62,7 @@ jobs:
nat
:
|
"8080": "80"
prepare
:
|
pkg install -y curl socat
pkg install -y curl socat
libnghttp2
usesh
:
true
run
:
|
cd ../acmetest \
...
...
.github/workflows/OpenBSD.yml
View file @
66a68edb
...
...
@@ -66,7 +66,7 @@ jobs:
envs
:
'
TEST_LOCAL
TestingDomain
TEST_ACME_Server
CA_ECDSA
CA
CA_EMAIL
TEST_PREFERRED_CHAIN
ACME_USE_WGET'
nat
:
|
"8080": "80"
prepare
:
pkg_add socat curl wget
prepare
:
pkg_add socat curl wget
libnghttp2
usesh
:
true
copyback
:
false
run
:
|
...
...
acme.sh
View file @
66a68edb
...
...
@@ -923,8 +923,16 @@ _sed_i() {
fi
}
if
[
"
$(
echo
abc | egrep
-o
b 2>/dev/null
)
"
=
"b"
]
;
then
__USE_EGREP
=
1
else
__USE_EGREP
=
""
fi
_egrep_o
()
{
if
!
egrep
-o
"
$1
"
2>/dev/null
;
then
if
[
"
$__USE_EGREP
"
]
;
then
egrep
-o
"
$1
"
else
sed
-n
's/.*\('
"
$1
"
'\).*/\1/p'
fi
}
...
...
@@ -2101,9 +2109,20 @@ _head_n() {
}
_tail_n
()
{
if
!
tail
-n
"
$1
"
2>/dev/null
;
then
if
_is_solaris
;
then
#fix for solaris
tail
-
"
$1
"
else
tail
-n
"
$1
"
fi
}
_tail_c
()
{
if
_is_solaris
;
then
#fix for solaris
tail
-
"
$1
"
c
else
tail
-c
"
$1
"
fi
}
...
...
@@ -2278,7 +2297,7 @@ _setopt() {
if
[
!
-f
"
$__conf
"
]
;
then
touch
"
$__conf
"
fi
if
[
-n
"
$(
tail
-c
1
<
"
$__conf
"
)
"
]
;
then
if
[
-n
"
$(
_
tail
_c
1 <
"
$__conf
"
)
"
]
;
then
echo
>>
"
$__conf
"
fi
...
...
dnsapi/dns_kappernet.sh
View file @
66a68edb
...
...
@@ -45,8 +45,8 @@ dns_kappernet_add() {
if
_kappernet_api GET
"action=new&subject=
$_domain
&data=
$data
"
;
then
if
_contains
"
$response
"
"{
\"
OK
\"
:true"
;
then
_info
"Waiting 1
20
second
s
for DNS to spread the new record"
_sleep 1
20
_info
"Waiting 1 second for DNS to spread the new record"
_sleep 1
return
0
else
_err
"Error creating a TXT DNS Record:
$fullhostname
TXT
$txtvalue
"
...
...
notify/aws_ses.sh
View file @
66a68edb
...
...
@@ -43,6 +43,7 @@ aws_ses_send() {
_err
"Please specify your region and try again. see https://docs.aws.amazon.com/general/latest/gr/ses.html"
return
1
fi
_saveaccountconf_mutable AWS_SES_REGION
"
$AWS_SES_REGION
"
#save for future use, unless using a role which will be fetched as needed
if
[
-z
"
$_using_role
"
]
;
then
...
...
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