Merge pull request #12 from germeier/newkeys

generate a new private key for each csr if the user wishes so

diff --git a/letsencrypt.sh b/letsencrypt.sh
index cc000d15f87b4033c007547dc67b2b22155a720f..2f6e0f202a8cf0a8cd8c8de999d18274a5121a7b 100755 (executable)
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -52,22 +52,27 @@ hex2bin() {
 }
 
 _request() {
-  temperr="$(mktemp)"
+  tempcont="$(mktemp)"
+
   if [[ "${1}" = "head" ]]; then
-    curl -sSf -I "${2}" 2> "${temperr}"
+    statuscode="$(curl -s -w "%{http_code}" -o "${tempcont}" "${2}" -I)"
   elif [[ "${1}" = "get" ]]; then
-    curl -sSf "${2}" 2> "${temperr}"
+    statuscode="$(curl -s -w "%{http_code}" -o "${tempcont}" "${2}")"
   elif [[ "${1}" = "post" ]]; then
-    curl -sSf "${2}" -d "${3}" 2> "${temperr}"
+    statuscode="$(curl -s -w "%{http_code}" -o "${tempcont}" "${2}" -d "${3}")"
   fi
 
-  if [[ -s "${temperr}" ]]; then
-    echo "  + ERROR: An error occured while sending ${1}-request to ${2} ($(<"${temperr}"))" >&2
-    rm -f "${temperr}"
+  if [[ ! "${statuscode:0:1}" = "2" ]]; then
+    echo "  + ERROR: An error occured while sending ${1}-request to ${2} (Status ${statuscode})" >&2
+    echo >&2
+    echo "Details:" >&2
+    echo "$(<"${tempcont}"))" >&2
+    rm -f "${tempcont}"
     exit 1
   fi
 
-  rm -f "${temperr}"
+  cat  "${tempcont}"
+  rm -f "${tempcont}"
 }
 
 signed_request() {