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
86256162
Commit
86256162
authored
Sep 18, 2020
by
Ed Lynes
Browse files
Merge branch 'dev' into edgedns
parents
a0b5305e
db24ca3d
Changes
3
Hide whitespace changes
Inline
Side-by-side
.github/workflows/DNS.yml
View file @
86256162
...
@@ -19,13 +19,11 @@ jobs:
...
@@ -19,13 +19,11 @@ jobs:
runs-on
:
ubuntu-latest
runs-on
:
ubuntu-latest
outputs
:
outputs
:
hasToken
:
${{ steps.step_one.outputs.hasToken }}
hasToken
:
${{ steps.step_one.outputs.hasToken }}
env
:
_ACME_CHECK_TOKEN_${{ secrets.TokenName1 }}
:
${{ secrets.TokenValue1 }}
steps
:
steps
:
-
name
:
Set the value
-
name
:
Set the value
id
:
step_one
id
:
step_one
run
:
|
run
:
|
if [ "$
_ACME_CHECK_TOKEN_$
{{
secrets.TokenName1}}" ] ; then
if [ "${{secrets.TokenName1}}" ] ; then
echo "::set-output name=hasToken::true"
echo "::set-output name=hasToken::true"
else
else
echo "::set-output name=hasToken::false"
echo "::set-output name=hasToken::false"
...
@@ -50,11 +48,8 @@ jobs:
...
@@ -50,11 +48,8 @@ jobs:
needs
:
CheckToken
needs
:
CheckToken
if
:
"
contains(needs.CheckToken.outputs.hasToken,
'true')"
if
:
"
contains(needs.CheckToken.outputs.hasToken,
'true')"
env
:
env
:
${{ secrets.TokenName1 }}
:
${{ secrets.TokenValue1 }}
${{ secrets.TokenName2 }}
:
${{ secrets.TokenValue2 }}
TEST_DNS
:
${{ secrets.TEST_DNS }}
TEST_DNS
:
${{ secrets.TEST_DNS }}
TestingDomain
:
${{ secrets.TestingDomain }}
TestingDomain
:
${{ secrets.TestingDomain }}
TEST_DNS_NO_WILDCARD
:
${{ secrets.TEST_DNS_NO_WILDCARD }}
TEST_DNS_NO_WILDCARD
:
${{ secrets.TEST_DNS_NO_WILDCARD }}
TEST_DNS_SLEEP
:
${{ secrets.TEST_DNS_SLEEP }}
TEST_DNS_SLEEP
:
${{ secrets.TEST_DNS_SLEEP }}
CASE
:
le_test_dnsapi
CASE
:
le_test_dnsapi
...
@@ -65,19 +60,34 @@ jobs:
...
@@ -65,19 +60,34 @@ jobs:
-
name
:
Clone acmetest
-
name
:
Clone acmetest
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
-
name
:
Set env file
-
name
:
Set env file
run
:
cd ../acmetest && echo "${{ secrets.TokenName1 }}" >> env.list && echo "${{ secrets.TokenName2 }}" >> env.list && echo "TEST_DNS_NO_WILDCARD" >> env.list && echo "TEST_DNS_SLEEP" >> env.list
run
:
|
cd ../acmetest
if [ "${{ secrets.TokenName1}}" ] ; then
echo "${{ secrets.TokenName1}}=${{ secrets.TokenValue1}}" >> env.list
fi
if [ "${{ secrets.TokenName2}}" ] ; then
echo "${{ secrets.TokenName2}}=${{ secrets.TokenValue2}}" >> env.list
fi
if [ "${{ secrets.TokenName3}}" ] ; then
echo "${{ secrets.TokenName3}}=${{ secrets.TokenValue3}}" >> env.list
fi
if [ "${{ secrets.TokenName4}}" ] ; then
echo "${{ secrets.TokenName4}}=${{ secrets.TokenValue4}}" >> env.list
fi
if [ "${{ secrets.TokenName5}}" ] ; then
echo "${{ secrets.TokenName5}}=${{ secrets.TokenValue5}}" >> env.list
fi
echo "TEST_DNS_NO_WILDCARD" >> env.list
echo "TEST_DNS_SLEEP" >> env.list
-
name
:
Run acmetest
-
name
:
Run acmetest
run
:
cd ../acmetest && ./rundocker.sh
_cron
run
:
cd ../acmetest && ./rundocker.sh
testall
MacOS
:
MacOS
:
runs-on
:
macos-latest
runs-on
:
macos-latest
needs
:
Docker
needs
:
Docker
env
:
env
:
${{ secrets.TokenName1 }}
:
${{ secrets.TokenValue1 }}
${{ secrets.TokenName2 }}
:
${{ secrets.TokenValue2 }}
TEST_DNS
:
${{ secrets.TEST_DNS }}
TEST_DNS
:
${{ secrets.TEST_DNS }}
TestingDomain
:
${{ secrets.TestingDomain }}
TestingDomain
:
${{ secrets.TestingDomain }}
TEST_DNS_NO_WILDCARD
:
${{ secrets.TEST_DNS_NO_WILDCARD }}
TEST_DNS_NO_WILDCARD
:
${{ secrets.TEST_DNS_NO_WILDCARD }}
TEST_DNS_SLEEP
:
${{ secrets.TEST_DNS_SLEEP }}
TEST_DNS_SLEEP
:
${{ secrets.TEST_DNS_SLEEP }}
CASE
:
le_test_dnsapi
CASE
:
le_test_dnsapi
...
@@ -90,17 +100,31 @@ jobs:
...
@@ -90,17 +100,31 @@ jobs:
-
name
:
Clone acmetest
-
name
:
Clone acmetest
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
-
name
:
Run acmetest
-
name
:
Run acmetest
run
:
cd ../acmetest && ./letest.sh
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
Windows
:
Windows
:
runs-on
:
windows-latest
runs-on
:
windows-latest
needs
:
MacOS
needs
:
MacOS
env
:
env
:
${{ secrets.TokenName1 }}
:
${{ secrets.TokenValue1 }}
${{ secrets.TokenName2 }}
:
${{ secrets.TokenValue2 }}
TEST_DNS
:
${{ secrets.TEST_DNS }}
TEST_DNS
:
${{ secrets.TEST_DNS }}
TestingDomain
:
${{ secrets.TestingDomain }}
TestingDomain
:
${{ secrets.TestingDomain }}
TEST_DNS_NO_WILDCARD
:
${{ secrets.TEST_DNS_NO_WILDCARD }}
TEST_DNS_NO_WILDCARD
:
${{ secrets.TEST_DNS_NO_WILDCARD }}
TEST_DNS_SLEEP
:
${{ secrets.TEST_DNS_SLEEP }}
TEST_DNS_SLEEP
:
${{ secrets.TEST_DNS_SLEEP }}
CASE
:
le_test_dnsapi
CASE
:
le_test_dnsapi
...
@@ -126,7 +150,24 @@ jobs:
...
@@ -126,7 +150,24 @@ jobs:
-
name
:
Clone acmetest
-
name
:
Clone acmetest
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
run
:
cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/
-
name
:
Run acmetest
-
name
:
Run acmetest
shell
:
cmd
shell
:
bash
run
:
cd ../acmetest && bash.exe -c ./letest.sh
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
dnsapi/dns_duckdns.sh
View file @
86256162
...
@@ -112,16 +112,21 @@ _duckdns_rest() {
...
@@ -112,16 +112,21 @@ _duckdns_rest() {
param
=
"
$2
"
param
=
"
$2
"
_debug param
"
$param
"
_debug param
"
$param
"
url
=
"
$DuckDNS_API
?
$param
"
url
=
"
$DuckDNS_API
?
$param
"
if
[
"
$DEBUG
"
-gt
0
]
;
then
url
=
"
$url
&verbose=true"
fi
_debug url
"
$url
"
_debug url
"
$url
"
# DuckDNS uses GET to update domain info
# DuckDNS uses GET to update domain info
if
[
"
$method
"
=
"GET"
]
;
then
if
[
"
$method
"
=
"GET"
]
;
then
response
=
"
$(
_get
"
$url
"
)
"
response
=
"
$(
_get
"
$url
"
)
"
_debug2 response
"
$response
"
if
[
"
$DEBUG
"
-gt
0
]
&&
_contains
"
$response
"
"UPDATED"
&&
_contains
"
$response
"
"OK"
;
then
response
=
"OK"
fi
else
else
_err
"Unsupported method"
_err
"Unsupported method"
return
1
return
1
fi
fi
_debug2 response
"
$response
"
return
0
return
0
}
}
dnsapi/dns_ovh.sh
View file @
86256162
...
@@ -248,7 +248,7 @@ _ovh_authentication() {
...
@@ -248,7 +248,7 @@ _ovh_authentication() {
# _domain=domain.com
# _domain=domain.com
_get_root
()
{
_get_root
()
{
domain
=
$1
domain
=
$1
i
=
2
i
=
1
p
=
1
p
=
1
while
true
;
do
while
true
;
do
h
=
$(
printf
"%s"
"
$domain
"
|
cut
-d
.
-f
$i
-100
)
h
=
$(
printf
"%s"
"
$domain
"
|
cut
-d
.
-f
$i
-100
)
...
...
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