github
/
acme.sh
mirror of https://github.com/acmesh-official/acme.sh
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'acmesh-official:master' into master

pull/3959/head
Martin Arndt 2023-07-30 14:56:31 +02:00 committed by GitHub
parent 80006f4730 0da839cce3
commit 66a68edbe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/DragonFlyBSD.yml vendored
View File

@ -62,7 +62,7 @@ jobs:
nat: | nat: |
"8080": "80" "8080": "80"
prepare: | prepare: |
pkg install -y curl socat pkg install -y curl socat libnghttp2
usesh: true usesh: true
run: | run: |
cd ../acmetest \ cd ../acmetest \

2
.github/workflows/OpenBSD.yml vendored
View File

@ -66,7 +66,7 @@ jobs:
envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET' envs: 'TEST_LOCAL TestingDomain TEST_ACME_Server CA_ECDSA CA CA_EMAIL TEST_PREFERRED_CHAIN ACME_USE_WGET'
nat: | nat: |
"8080": "80" "8080": "80"
prepare: pkg_add socat curl wget prepare: pkg_add socat curl wget libnghttp2
usesh: true usesh: true
copyback: false copyback: false
run: | run: |

25
acme.sh
View File

@ -923,8 +923,16 @@ _sed_i() {
fi fi
} }
if [ "$(echo abc | egrep -o b 2>/dev/null)" = "b" ]; then
__USE_EGREP=1
else
__USE_EGREP=""
fi
_egrep_o() { _egrep_o() {
if ! egrep -o "$1" 2>/dev/null; then if [ "$__USE_EGREP" ]; then
egrep -o "$1"
else
sed -n 's/.*\('"$1"'\).*/\1/p' sed -n 's/.*\('"$1"'\).*/\1/p'
fi fi
} }
@ -2101,9 +2109,20 @@ _head_n() {
} }
_tail_n() { _tail_n() {
if ! tail -n "$1" 2>/dev/null; then if _is_solaris; then
#fix for solaris #fix for solaris
tail -"$1" tail -"$1"
else
tail -n "$1"
fi
}
_tail_c() {
if _is_solaris; then
#fix for solaris
tail -"$1"c
else
tail -c "$1"
fi fi
} }
@ -2278,7 +2297,7 @@ _setopt() {
if [ ! -f "$__conf" ]; then if [ ! -f "$__conf" ]; then
touch "$__conf" touch "$__conf"
fi fi
if [ -n "$(tail -c1 <"$__conf")" ]; then if [ -n "$(_tail_c 1 <"$__conf")" ]; then
echo >>"$__conf" echo >>"$__conf"
fi fi

4
dnsapi/dns_kappernet.sh
View File

@ -45,8 +45,8 @@ dns_kappernet_add() {
if _kappernet_api GET "action=new&subject=$_domain&data=$data"; then if _kappernet_api GET "action=new&subject=$_domain&data=$data"; then
if _contains "$response" "{\"OK\":true"; then if _contains "$response" "{\"OK\":true"; then
_info "Waiting 120 seconds for DNS to spread the new record" _info "Waiting 1 second for DNS to spread the new record"
_sleep 120 _sleep 1
return 0 return 0
else else
_err "Error creating a TXT DNS Record: $fullhostname TXT $txtvalue" _err "Error creating a TXT DNS Record: $fullhostname TXT $txtvalue"

1
notify/aws_ses.sh
View File

@ -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" _err "Please specify your region and try again. see https://docs.aws.amazon.com/general/latest/gr/ses.html"
return 1 return 1
fi fi
_saveaccountconf_mutable AWS_SES_REGION "$AWS_SES_REGION"
#save for future use, unless using a role which will be fetched as needed #save for future use, unless using a role which will be fetched as needed
if [ -z "$_using_role" ]; then if [ -z "$_using_role" ]; then