Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
067c1771
Unverified
Commit
067c1771
authored
Nov 22, 2020
by
neil
Committed by
GitHub
Nov 22, 2020
Browse files
Merge pull request #3263 from acmesh-official/dev
sync
parents
75660e6f
349429b7
Changes
5
Hide whitespace changes
Inline
Side-by-side
.github/workflows/DNS.yml
View file @
067c1771
...
...
@@ -208,5 +208,42 @@ jobs:
cd ../acmetest
./letest.sh
Solaris
:
runs-on
:
macos-latest
needs
:
FreeBSD
env
:
TEST_DNS
:
${{ secrets.TEST_DNS }}
TestingDomain
:
${{ secrets.TestingDomain }}
TEST_DNS_NO_WILDCARD
:
${{ secrets.TEST_DNS_NO_WILDCARD }}
TEST_DNS_SLEEP
:
${{ secrets.TEST_DNS_SLEEP }}
CASE
:
le_test_dnsapi
TEST_LOCAL
:
1
DEBUG
:
1
steps
:
-
uses
:
actions/checkout@v2
-
name
:
Clone acmetest
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
-
uses
:
vmactions/solaris-vm@v0.0.1
with
:
envs
:
'
TEST_DNS
TestingDomain
TEST_DNS_NO_WILDCARD
TEST_DNS_SLEEP
CASE
TEST_LOCAL
DEBUG
${{
secrets.TokenName1}}
${{
secrets.TokenName2}}
${{
secrets.TokenName3}}
${{
secrets.TokenName4}}
${{
secrets.TokenName5}}'
prepare
:
pkgutil -y -i socat curl
run
:
|
if [ "${{ secrets.TokenName1}}" ] ; then
export ${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}
fi
if [ "${{ secrets.TokenName2}}" ] ; then
export ${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}
fi
if [ "${{ secrets.TokenName3}}" ] ; then
export ${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}
fi
if [ "${{ secrets.TokenName4}}" ] ; then
export ${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}
fi
if [ "${{ secrets.TokenName5}}" ] ; then
export ${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}
fi
cd ../acmetest
./letest.sh
.github/workflows/LetsEncrypt.yml
View file @
067c1771
...
...
@@ -119,3 +119,29 @@ jobs:
run
:
|
cd ../acmetest && ./letest.sh
Solaris
:
runs-on
:
macos-latest
needs
:
FreeBSD
env
:
NGROK_TOKEN
:
${{ secrets.NGROK_TOKEN }}
TEST_LOCAL
:
1
steps
:
-
uses
:
actions/checkout@v2
-
uses
:
vmactions/ngrok-tunnel@v0.0.1
id
:
ngrok
with
:
protocol
:
http
port
:
8080
-
name
:
Set envs
run
:
echo "TestingDomain=${{steps.ngrok.outputs.server}}" >> $GITHUB_ENV
-
name
:
Clone acmetest
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
-
uses
:
vmactions/solaris-vm@v0.0.1
with
:
envs
:
'
TEST_LOCAL
TestingDomain'
nat
:
|
"8080": "80"
prepare
:
pkgutil -y -i socat curl
run
:
|
cd ../acmetest && ./letest.sh
README.md
View file @
067c1771
...
...
@@ -60,10 +60,10 @@ Twitter: [@neilpangxa](https://twitter.com/neilpangxa)
|1|
[

](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Mac OSX
|2|
[

](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|Windows (cygwin with curl, openssl and crontab included)
|3|
[

](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|FreeBSD
|4|
[

](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|
Ubuntu
|5|
[

](https://github.com/acmesh-official/acme
test#here-are-the-latest-status)|pfsense
|6|
[

](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|
OpenBSD
|7|
[

](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|
SunOS/Solaris
|4|
[

](https://github.com/acmesh-official/acme.sh/actions?query=workflow%3ALetsEncrypt)|
Solaris
|5|
[

](https://github.com/acmesh-official/acme
.sh/actions?query=workflow%3ALetsEncrypt)| Ubuntu
|6|
[

](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|
pfsense
|7|
[

](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|
OpenBSD
|8|
[

](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)| Debian
|9|
[

](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|CentOS
|10|
[

](https://github.com/acmesh-official/acmetest#here-are-the-latest-status)|openSUSE
...
...
acme.sh
View file @
067c1771
...
...
@@ -2086,7 +2086,7 @@ _send_signed_request() {
_debug2 original
"
$response
"
if
echo
"
$responseHeaders
"
|
grep
-i
"Content-Type: *application/json"
>
/dev/null 2>&1
;
then
response
=
"
$(
echo
"
$response
"
| _
normalizeJson | _json_decode
)
"
response
=
"
$(
echo
"
$response
"
| _
json_decode | _normalizeJson
)
"
fi
_debug2 response
"
$response
"
...
...
@@ -5823,7 +5823,7 @@ _deactivate() {
_URL_NAME
=
"uri"
fi
entries
=
"
$(
echo
"
$response
"
|
tr
']['
'='
| _egrep_o
"challenges
\"
: *=[^=]*="
|
tr
'}{'
'\n'
|
grep
"
\"
status
\"
: *
\"
valid
\"
"
)
"
entries
=
"
$(
echo
"
$response
"
|
tr
']['
'=
=
'
| _egrep_o
"challenges
\"
: *=[^=]*="
|
tr
'}{'
'\n'
|
grep
"
\"
status
\"
: *
\"
valid
\"
"
)
"
if
[
-z
"
$entries
"
]
;
then
_info
"No valid entries found."
if
[
-z
"
$thumbprint
"
]
;
then
...
...
dnsapi/dns_dpi.sh
View file @
067c1771
...
...
@@ -75,7 +75,7 @@ dns_dpi_rm() {
return
1
fi
_contains
"
$response
"
"
Action completed
successful"
_contains
"
$response
"
"
Operation
successful"
}
...
...
@@ -93,7 +93,7 @@ add_record() {
return
1
fi
_contains
"
$response
"
"
Action completed
successful"
||
_contains
"
$response
"
"Domain record already exists"
_contains
"
$response
"
"
Operation
successful"
||
_contains
"
$response
"
"Domain record already exists"
}
#################### Private functions below ##################################
...
...
@@ -117,7 +117,7 @@ _get_root() {
return
1
fi
if
_contains
"
$response
"
"
Action completed
successful"
;
then
if
_contains
"
$response
"
"
Operation
successful"
;
then
_domain_id
=
$(
printf
"%s
\n
"
"
$response
"
| _egrep_o
"
\"
id
\"
:
\"
[^
\"
]*
\"
"
|
cut
-d
:
-f
2 |
tr
-d
\"
)
_debug _domain_id
"
$_domain_id
"
if
[
"
$_domain_id
"
]
;
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