Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implemented replacing ${DOMAIN} in ACL with current domain name. #267

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implemented replacing ${DOMAIN} in ACL with current domain name. #267

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cf8f2a
Implemented replacing ${DOMAIN} in ACL with current domain name.
zazaz-de Mar 16, 2017
00467b6
Changed version to 2.11 and added changes to log.
zazaz-de Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion getssl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,11 @@
# 2017-01-30 issue #243 compatibility with bash 3.0 (2.08)
# 2017-01-30 issue #243 additional compatibility with bash 3.0 (2.09)
# 2017-02-18 add OCSP Must-Staple to the domain csr generation (2.10)
# 2017-03-16 implemented replacing ${DOMAIN} in ACL with current domain name (2.11)
# ----------------------------------------------------------------------------------------

PROGNAME=${0##*/}
VERSION="2.10"
VERSION="2.11"

# defaults
ACCOUNT_KEY_LENGTH=4096
Expand Down Expand Up @@ -383,6 +384,8 @@ check_config() { # check the config files for all obvious errors
DOMAIN_ACL="${ACL[$dn]}"
fi

DOMAIN_ACL=$(echo $DOMAIN_ACL | sed -e "s/\${DOMAIN}/${d}/g")

if [[ $VALIDATE_VIA_DNS != "true" ]]; then # using http-01 challenge
if [[ -z "${DOMAIN_ACL}" ]]; then
info "${DOMAIN}: ACL location not specified for domain $d in $DOMAIN_DIR/getssl.cfg"
Expand Down Expand Up @@ -1815,6 +1818,8 @@ for d in $alldomains; do
DOMAIN_ACL="${ACL[$dn]}"
fi

DOMAIN_ACL=$(echo $DOMAIN_ACL | sed -e "s/\${DOMAIN}/${d}/g")

# request a challenge token from ACME server
request="{\"resource\":\"new-authz\",\"identifier\":{\"type\":\"dns\",\"value\":\"$d\"}}"
send_signed_request "$URL_new_authz" "$request"
Expand Down