From 2dc2bcc8a987fa928a6c61aa23628362a2104551 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Sat, 7 Apr 2018 23:16:35 +0200
Subject: [PATCH] update script for acme-tiny 4.0 and bug fixing
---
renew_cert.sh | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/renew_cert.sh b/renew_cert.sh
index 361225e..b71ac28 100755
--- a/renew_cert.sh
+++ b/renew_cert.sh
@@ -6,12 +6,10 @@ path="$( cd "$(dirname "$0")" ; pwd -P )"
# variables
acme_dir=/srv/certs/acme-challenge/.well-known/acme-challenge
opt_folder=$path/opt
-le_cert=$opt_folder/lets-encrypt-x3-cross-signed.pem
account_key=$opt_folder/account.key
acme_tiny=$opt_folder/acme_tiny.py
openssl_conf=$opt_folder/openssl.conf
-
#############
# script
@@ -38,12 +36,6 @@ if [ ! -f "$acme_tiny" ]; then
exit 1
fi
-if [ ! -f "$le_cert" ]; then
- echo "LetsEncrypt cert doesn't exists!"
- echo "Downloading root cert..."
- wget -O - https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem > $le_cert
-fi
-
acme_dir=${acme_dir%/}
opt_folder=${opt_folder%/}
@@ -77,7 +69,7 @@ do
fi
if [ ${#DOMAINS[@]} -eq 0 ]; then
- echo "No domains given for \"$name\"."
+ echo "No domains given for \"$NAME\"."
continue
fi
@@ -88,6 +80,7 @@ do
if [ ! -f "$key" ]; then
echo "Domain key doesn't exists. Generating..."
openssl genrsa 4096 > "$key"
+ #openssl ecparam -out "$key" -name secp384r1 -genkey
fi
# domain csr
@@ -113,7 +106,7 @@ do
fi
# get certificate
- python "$path/$acme_tiny" --account-key "$account_key" --csr "$csr" --acme-dir "$acme_dir" > "$arg/tmp.crt"
+ python "$acme_tiny" --account-key "$account_key" --csr "$csr" --acme-dir "$acme_dir" > "$arg/tmp.crt"
if [ $? != 0 ]; then
rm -rf $arg/tmp.crt
@@ -121,12 +114,9 @@ do
continue
fi
- mv -f "$arg/tmp.crt" "$path/$arg/$NAME.crt"
+ mv -f "$arg/tmp.crt" "$arg/$NAME.crt"
- # append letsencrypt cert
- cat "$arg/$NAME.crt" "$le_cert" > "$arg/$NAME.pem"
-
- echo "Certificate for \"$name\" successfully created!"
+ echo "Certificate for \"$NAME\" successfully created!"
counter=$((counter+1))
done