generate private key if non-existant

[andy/dehydrated.git] / letsencrypt.sh

diff --git a/letsencrypt.sh b/letsencrypt.sh
index 9c7812b93d57743511116d319291fa08b14ed2ce..641be7fabfc3b95d0f72e5cb4b1e9da727c43844 100755 (executable)
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -51,7 +51,7 @@ sign_domain() {
     mkdir "certs/${domain}"
 
     echo "  + Generating private key..."
-    openssl genrsa -out "certs/${domain}/privkey.pem" 4096 > /dev/null
+    openssl genrsa -out "certs/${domain}/privkey.pem" 4096 2> /dev/null > /dev/null
     echo "  + Generating signing request..."
     openssl req -new -sha256 -key "certs/${domain}/privkey.pem" -out "certs/${domain}/cert.csr" -subj "/CN=${domain}/" -reqexts SAN -config <(cat /etc/ssl/openssl.cnf <(printf "[SAN]\nsubjectAltName=${SAN}")) > /dev/null
   fi
@@ -73,7 +73,7 @@ sign_domain() {
     status="$(echo "${result}" | grep -Eo '"status":\s*"[^"]*"' | cut -d'"' -f4)"
 
     if [ ! "${status}" = "pending" ] && [ ! "${status}" = "valid" ]; then
-      echo "  + Challenge is invalid!"
+      echo "  + Challenge is invalid! (${result})"
       exit 1
     fi
 
@@ -91,6 +91,13 @@ sign_domain() {
   echo "  + Done!"
 }
 
+if [ ! -e "private_key.pem" ]; then
+  echo "+ Generating account key..."
+  openssl genrsa -out "private_key.pem" 4096 2> /dev/null > /dev/null
+  echo "+ Registering account key with letsencrypt..."
+  register
+fi
+
 cat domains.txt | sed 's/^\s*//g;s/\s*$//g' | grep -v '^#' | grep -v '^$' | while read line; do
   sign_domain $line
 done