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
ccefd3be
Unverified
Commit
ccefd3be
authored
May 13, 2019
by
neil
Committed by
GitHub
May 13, 2019
Browse files
Merge pull request #2255 from mdbraber/update-acmeproxy
dns_acmeproxy: Username/password no longer required
parents
ade9d662
5e165819
Changes
1
Show whitespace changes
Inline
Side-by-side
dnsapi/dns_acmeproxy.sh
View file @
ccefd3be
...
...
@@ -46,20 +46,16 @@ _acmeproxy_request() {
return
1
fi
## Check for the credentials
if
[
-z
"
$ACMEPROXY_USERNAME
"
]
||
[
-z
"
$ACMEPROXY_PASSWORD
"
]
;
then
ACMEPROXY_USERNAME
=
""
ACMEPROXY_PASSWORD
=
""
_err
"You didn't set username and password"
_err
"Please set them via 'export ACMEPROXY_USERNAME=...' and 'export ACMEPROXY_PASSWORD=...' and try again."
return
1
fi
## Save the credentials to the account file
_saveaccountconf_mutable ACMEPROXY_ENDPOINT
"
$ACMEPROXY_ENDPOINT
"
_saveaccountconf_mutable ACMEPROXY_USERNAME
"
$ACMEPROXY_USERNAME
"
_saveaccountconf_mutable ACMEPROXY_PASSWORD
"
$ACMEPROXY_PASSWORD
"
if
[
-z
"
$ACMEPROXY_USERNAME
"
]
||
[
-z
"
$ACMEPROXY_PASSWORD
"
]
;
then
_info
"ACMEPROXY_USERNAME and/or ACMEPROXY_PASSWORD not set - using without client authentication! Make sure you're using server authentication (e.g. IP-based)"
export
_H1
=
"Accept: application/json"
export
_H2
=
"Content-Type: application/json"
else
## Base64 encode the credentials
credentials
=
$(
printf
"%b"
"
$ACMEPROXY_USERNAME
:
$ACMEPROXY_PASSWORD
"
| _base64
)
...
...
@@ -67,6 +63,7 @@ _acmeproxy_request() {
export
_H1
=
"Authorization: Basic
$credentials
"
export
_H2
=
"Accept: application/json"
export
_H3
=
"Content-Type: application/json"
fi
## Add the challenge record to the acmeproxy grid member
response
=
"
$(
_post
"{
\"
fqdn
\"
:
\"
$fulldomain
.
\"
,
\"
value
\"
:
\"
$txtvalue
\"
}"
"
$ACMEPROXY_ENDPOINT
/
$action
"
""
"POST"
)
"
...
...
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