starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-07-06 21:15:10 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

fixed domains.txt parsing (theoretically compatible with wildcard domains)

Browse Source
This commit is contained in:
Lukas Schauer
2018-01-13 20:54:55 +01:00
parent 68cb1e0661
commit 3e521e1c01
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dehydrated
+6 -1
View File
@@ -1075,7 +1075,9 @@ command_sign_domains() {
# Generate certificates for all domains found in domains.txt. Check if existing certificate are about to expire # Generate certificates for all domains found in domains.txt. Check if existing certificate are about to expire
ORIGIFS="${IFS}" ORIGIFS="${IFS}"
IFS=$'\n' IFS=$'\n'
for line in "$(<"${DOMAINS_TXT}" tr -d '\r' | awk '{print tolower($0)}' | _sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' -e 's/[[:space:]]+/ /g' -e 's/([^ ])>/\1 >/g' -e 's/> />/g' | (grep -vE '^(#|$)' || true))"; do [[ -n "${ZSH_VERSION:-}" ]] && set -o noglob || set -f
for line in $(<"${DOMAINS_TXT}" tr -d '\r' | awk '{print tolower($0)}' | _sed -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g' -e 's/[[:space:]]+/ /g' -e 's/([^ ])>/\1 >/g' -e 's/> />/g' | (grep -vE '^(#|$)' || true)); do
[[ -n "${ZSH_VERSION:-}" ]] && set +o noglob || set +f
reset_configvars reset_configvars
IFS="${ORIGIFS}" IFS="${ORIGIFS}"
alias="$(grep -Eo '>[^ ]+' <<< "${line}" || true)" alias="$(grep -Eo '>[^ ]+' <<< "${line}" || true)"
@@ -1187,12 +1189,14 @@ command_sign_domains() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if [[ ! "${skip}" = "yes" ]]; then if [[ ! "${skip}" = "yes" ]]; then
update_ocsp="yes" update_ocsp="yes"
[[ -n "${ZSH_VERSION:-}" ]] && set -o noglob || set -f
if [[ "${PARAM_KEEP_GOING:-}" = "yes" ]]; then if [[ "${PARAM_KEEP_GOING:-}" = "yes" ]]; then
sign_domain "${certdir}" ${domain} ${morenames} & sign_domain "${certdir}" ${domain} ${morenames} &
wait $! || true wait $! || true
else else
sign_domain "${certdir}" ${domain} ${morenames} sign_domain "${certdir}" ${domain} ${morenames}
fi fi
[[ -n "${ZSH_VERSION:-}" ]] && set +o noglob || set +f
fi fi
if [[ "${OCSP_FETCH}" = "yes" ]]; then if [[ "${OCSP_FETCH}" = "yes" ]]; then
@@ -1219,6 +1223,7 @@ command_sign_domains() {
fi fi
fi fi
done done
[[ -n "${ZSH_VERSION:-}" ]] && set +o noglob || set +f
reset_configvars reset_configvars
# remove temporary domains.txt file if used # remove temporary domains.txt file if used