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

Redirect additional errors to STDERR

Browse Source
This commit is contained in:
Herman van Rink
2017-04-17 15:08:42 +02:00
committed by Lukas Schauer
parent 5787cd6a47
commit 14a5f63077
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dehydrated
+10 -10
View File
@@ -248,18 +248,18 @@ init_system() {
if [[ ! -e "${ACCOUNT_KEY}" ]]; then if [[ ! -e "${ACCOUNT_KEY}" ]]; then
REAL_LICENSE="$(http_request head "${CA_TERMS}" | (grep Location: || true) | awk -F ': ' '{print $2}' | tr -d '\n\r')" REAL_LICENSE="$(http_request head "${CA_TERMS}" | (grep Location: || true) | awk -F ': ' '{print $2}' | tr -d '\n\r')"
if [[ -z "${REAL_LICENSE}" ]]; then if [[ -z "${REAL_LICENSE}" ]]; then
printf '\n' printf '\n' >&2
printf 'Error retrieving terms of service from certificate authority.\n' printf 'Error retrieving terms of service from certificate authority.\n' >&2
printf 'Please set LICENSE in config manually.\n' printf 'Please set LICENSE in config manually.\n' >&2
exit 1 exit 1
fi fi
if [[ ! "${LICENSE}" = "${REAL_LICENSE}" ]]; then if [[ ! "${LICENSE}" = "${REAL_LICENSE}" ]]; then
if [[ "${PARAM_ACCEPT_TERMS:-}" = "yes" ]]; then if [[ "${PARAM_ACCEPT_TERMS:-}" = "yes" ]]; then
LICENSE="${REAL_LICENSE}" LICENSE="${REAL_LICENSE}"
else else
printf '\n' printf '\n' >&2
printf 'To use dehydrated with this certificate authority you have to agree to their terms of service which you can find here: %s\n\n' "${REAL_LICENSE}" printf 'To use dehydrated with this certificate authority you have to agree to their terms of service which you can find here: %s\n\n' "${REAL_LICENSE}" >&2
printf 'To accept these terms of service run `%s --register --accept-terms`.\n' "${0}" printf 'To accept these terms of service run `%s --register --accept-terms`.\n' "${0}" >&2
exit 1 exit 1
fi fi
fi fi
@@ -297,9 +297,9 @@ init_system() {
fi fi
if [[ "${FAILED}" = "true" ]]; then if [[ "${FAILED}" = "true" ]]; then
echo echo >&2
echo echo >&2
echo "Error registering account key. See message above for more information." echo "Error registering account key. See message above for more information." >&2
rm "${ACCOUNT_KEY}" "${ACCOUNT_KEY_JSON}" rm "${ACCOUNT_KEY}" "${ACCOUNT_KEY_JSON}"
exit 1 exit 1
fi fi
@@ -951,7 +951,7 @@ command_sign_domains() {
declare -- "${config_var}=${config_value}" declare -- "${config_var}=${config_value}"
;; ;;
_) ;; _) ;;
*) echo " ! Setting ${config_var} on a per-certificate base is not (yet) supported" *) echo " ! Setting ${config_var} on a per-certificate base is not (yet) supported" >&2
esac esac
done done
IFS="${ORIGIFS}" IFS="${ORIGIFS}"