fix acme script downloading and better error handling

This commit is contained in:
Roman Hoellen 2018-09-13 11:52:05 +02:00
parent bb256fae9d
commit dba0e2f9ad

View File

@ -37,20 +37,20 @@ if [ ! -d "$acme_dir" ]; then
exit 1 exit 1
fi fi
if [ ! -f "$account_key" ]; then if [ ! -s "$account_key" ]; then
echo "Account Key doesn't exists!" echo "Account Key doesn't exists!"
exit 1 exit 1
fi fi
if [ ! -f "$acme_tiny" ]; then if [ ! -s "$acme_tiny" ]; then
echo "Python script acme_tiny.py is missing. Downloading... " echo -n "Python script acme_tiny.py is missing. Downloading... "
wget -qo $acme_tiny https://raw.githubusercontent.com/diafygi/acme-tiny/4.0.4/acme_tiny.py wget -qO "$acme_tiny" https://raw.githubusercontent.com/diafygi/acme-tiny/4.0.4/acme_tiny.py
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "Could not download acme_tiny.py script." echo -ne "\nCould not download acme_tiny.py script.\n"
rm -rf $acme_tiny rm -rf "$acme_tiny"
exit 1 exit 1
fi fi
echo "Finished" echo -ne "Finished\n"
fi fi
acme_dir=${acme_dir%/} acme_dir=${acme_dir%/}
@ -70,7 +70,7 @@ do
continue continue
fi fi
if [ ! -f "$arg/domain.conf" ]; then if [ ! -s "$arg/domain.conf" ]; then
echo "Configuration file doen't exists!" echo "Configuration file doen't exists!"
continue continue
fi fi
@ -94,7 +94,7 @@ do
# domain key # domain key
key="$arg/$NAME.key" key="$arg/$NAME.key"
if [ ! -f "$key" ]; then if [ ! -s "$key" ]; then
echo "Domain key doesn't exists. Generating..." echo "Domain key doesn't exists. Generating..."
openssl genrsa 4096 > "$key" openssl genrsa 4096 > "$key"
#openssl ecparam -out "$key" -name secp384r1 -genkey #openssl ecparam -out "$key" -name secp384r1 -genkey
@ -103,7 +103,7 @@ do
# domain csr # domain csr
csr="$arg/$NAME.csr" csr="$arg/$NAME.csr"
if [ ! -f "$csr" ]; then if [ ! -s "$csr" ]; then
echo "Domain csr file doesn't exists. Generating..." echo "Domain csr file doesn't exists. Generating..."
if [ ${#DOMAINS[@]} -eq 1 ]; then if [ ${#DOMAINS[@]} -eq 1 ]; then
# single domain # single domain