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
f2b9af01
Commit
f2b9af01
authored
Jul 08, 2017
by
Lonnie Abelbeck
Browse files
Merge remote-tracking branch 'upstream/dev' into dns_dyn
parents
9bd2d927
20028725
Changes
4
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
f2b9af01
...
...
@@ -40,7 +40,7 @@ script:
-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then ~/shfmt -l -w -i 2 . ; fi
-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then git diff --exit-code && echo "shfmt OK" ; fi
-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck -V ; fi
-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck **/*.sh && echo "shellcheck OK" ; fi
-
if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck
-e SC2181
**/*.sh && echo "shellcheck OK" ; fi
-
cd ..
-
git clone https://github.com/Neilpang/acmetest.git && cp -r acme.sh acmetest/ && cd acmetest
-
if [ "$TRAVIS_OS_NAME" = "linux" -a "$NGROK_TOKEN" ]; then sudo TEST_LOCAL="$TEST_LOCAL" NGROK_TOKEN="$NGROK_TOKEN" ./letest.sh ; fi
...
...
Dockerfile
View file @
f2b9af01
...
...
@@ -44,6 +44,7 @@ RUN for verb in help \
create-domain-key \
createCSR \
deactivate \
deactivate-account \
; do \
printf -- "%b" "#!/usr/bin/env sh\n/root/.acme.sh/acme.sh --${verb} --config-home /acme.sh \"\$@\"" >/usr/local/bin/--${verb} && chmod +x /usr/local/bin/--${verb} \
; done
...
...
dnsapi/dns_aws.sh
View file @
f2b9af01
...
...
@@ -208,7 +208,7 @@ aws_rest() {
kServiceH
=
"
$(
printf
"
$Service
%s"
| _hmac
"
$Hash
"
"
$kRegionH
"
hex
)
"
_debug2 kServiceH
"
$kServiceH
"
kSigningH
=
"
$(
printf
"aws4_request
%s
"
| _hmac
"
$Hash
"
"
$kServiceH
"
hex
)
"
kSigningH
=
"
$(
printf
"%s"
"aws4_request"
| _hmac
"
$Hash
"
"
$kServiceH
"
hex
)
"
_debug2 kSigningH
"
$kSigningH
"
signature
=
"
$(
printf
"
$StringToSign
%s"
| _hmac
"
$Hash
"
"
$kSigningH
"
hex
)
"
...
...
dnsapi/dns_infoblox.sh
View file @
f2b9af01
...
...
@@ -41,10 +41,10 @@ dns_infoblox_add() {
export
_H2
=
"Authorization: Basic
$Infoblox_CredsEncoded
"
## Add the challenge record to the Infoblox grid member
result
=
$(
_post
""
"
$baseurlnObject
"
""
"POST"
)
result
=
"
$(
_post
""
"
$baseurlnObject
"
""
"POST"
)
"
## Let's see if we get something intelligible back from the unit
if
echo
"
$result
"
| egrep
"record:txt/.*:.*/
$Infoblox_View
"
;
then
if
[
"
$(
echo
"
$result
"
|
_
egrep
_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
]
;
then
_info
"Successfully created the txt record"
return
0
else
...
...
@@ -66,7 +66,7 @@ dns_infoblox_rm() {
_debug txtvalue
"
$txtvalue
"
## Base64 encode the credentials
Infoblox_CredsEncoded
=
$(
printf
"%b"
"
$Infoblox_Creds
"
| _base64
)
Infoblox_CredsEncoded
=
"
$(
printf
"%b"
"
$Infoblox_Creds
"
| _base64
)
"
## Construct the HTTP Authorization header
export
_H1
=
"Accept-Language:en-US"
...
...
@@ -74,17 +74,17 @@ dns_infoblox_rm() {
## Does the record exist? Let's check.
baseurlnObject
=
"https://
$Infoblox_Server
/wapi/v2.2.2/record:txt?name=
$fulldomain
&text=
$txtvalue
&view=
$Infoblox_View
&_return_type=xml-pretty"
result
=
$(
_get
"
$baseurlnObject
"
)
result
=
"
$(
_get
"
$baseurlnObject
"
)
"
## Let's see if we get something intelligible back from the grid
if
echo
"
$result
"
| egrep
"record:txt/.*:.*/
$Infoblox_View
"
;
then
if
[
"
$(
echo
"
$result
"
|
_
egrep
_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
]
;
then
## Extract the object reference
objRef
=
$(
printf
"%b"
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$Infoblox_View
"
)
objRef
=
"
$(
printf
"%b"
"
$result
"
| _egrep_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
objRmUrl
=
"https://
$Infoblox_Server
/wapi/v2.2.2/
$objRef
"
## Delete them! All the stale records!
rmResult
=
$(
_post
""
"
$objRmUrl
"
""
"DELETE"
)
rmResult
=
"
$(
_post
""
"
$objRmUrl
"
""
"DELETE"
)
"
## Let's see if that worked
if
echo
"
$rmResult
"
| egrep
"record:txt/.*:.*/
$Infoblox_View
"
;
then
if
[
"
$(
echo
"
$rmResult
"
|
_
egrep
_o
"record:txt/.*:.*/
$Infoblox_View
"
)
"
]
;
then
_info
"Successfully deleted
$objRef
"
return
0
else
...
...
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