starred/dehydrated
1
0
Fork 0
mirror of https://github.com/dehydrated-io/dehydrated.git synced 2026-05-18 04:46:54 +02:00
Code Issues 79 Packages Projects Releases 10 Wiki Activity

release 0.6.5 (fixed apiv1 compatibility...)

Browse Source
This commit is contained in:
Lukas Schauer
2019-06-26 12:29:39 +02:00
parent 4f358e22f4
commit 05eda91a2f
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+4
View File
@@ -1,6 +1,10 @@
# Change Log # Change Log
This file contains a log of major changes in dehydrated This file contains a log of major changes in dehydrated
## [0.6.5] - 2019-06-26
## Fixed
- Fixed broken APIv1 compatibility from last update
## [0.6.4] - 2019-06-25 ## [0.6.4] - 2019-06-25
## Changed ## Changed
- Fetch account ID from Location header instead of account json - Fetch account ID from Location header instead of account json
dehydrated
+13 -12
View File
@@ -17,7 +17,7 @@ umask 077 # paranoid umask, we're creating private keys
exec 3>&- exec 3>&-
exec 4>&- exec 4>&-
VERSION="0.6.4" VERSION="0.6.5"
# Find directory in which this script is stored by traversing all symbolic links # Find directory in which this script is stored by traversing all symbolic links
SOURCE="${0}" SOURCE="${0}"
@@ -403,20 +403,21 @@ init_system() {
# Read account information or request from CA if missing # Read account information or request from CA if missing
if [[ -e "${ACCOUNT_KEY_JSON}" ]]; then if [[ -e "${ACCOUNT_KEY_JSON}" ]]; then
if [[ ! -e "${ACCOUNT_ID_JSON}" ]]; then
echo "+ Fetching account ID..."
ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | awk '{print $2}' | tr -d '\r\n')"
ACCOUNT_ID="${ACCOUNT_URL##*/}"
echo '{"id": "'"${ACCOUNT_ID}"'"}' > "${ACCOUNT_ID_JSON}"
else
ACCOUNT_ID="$(cat "${ACCOUNT_ID_JSON}" | get_json_string_value id)"
fi
if [[ -z "${ACCOUNT_ID}" ]]; then
_exiterr "Unknown error on fetching account information"
fi
if [[ ${API} -eq 1 ]]; then if [[ ${API} -eq 1 ]]; then
ACCOUNT_ID="$(cat "${ACCOUNT_KEY_JSON}" | get_json_int_value id)"
ACCOUNT_URL="${CA_REG}/${ACCOUNT_ID}" ACCOUNT_URL="${CA_REG}/${ACCOUNT_ID}"
else else
if [[ -e "${ACCOUNT_ID_JSON}" ]]; then
ACCOUNT_ID="$(cat "${ACCOUNT_ID_JSON}" | get_json_string_value id)"
else
echo "+ Fetching account ID..."
ACCOUNT_URL="$(signed_request "${CA_NEW_ACCOUNT}" '{"onlyReturnExisting": true}' 4>&1 | grep -i ^Location: | awk '{print $2}' | tr -d '\r\n')"
ACCOUNT_ID="${ACCOUNT_URL##*/}"
if [[ -z "${ACCOUNT_ID}" ]]; then
_exiterr "Unknown error on fetching account information"
fi
echo '{"id": "'"${ACCOUNT_ID}"'"}' > "${ACCOUNT_ID_JSON}"
fi
ACCOUNT_URL="${CA_ACCOUNT}/${ACCOUNT_ID}" ACCOUNT_URL="${CA_ACCOUNT}/${ACCOUNT_ID}"
fi fi
else else