From: Lukas Schauer <lukas@schauer.so>
Date: Mon, 14 Dec 2015 00:37:03 +0000 (+0100)
Subject: use config vars from letsencrypt.sh in import-script
X-Git-Tag: v0.1.0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62037de04169ca36c49c581c37d0cffbce86e401;p=thirdparty%2Fdehydrated.git

use config vars from letsencrypt.sh in import-script
---

diff --git a/import-certs.sh b/import-certs.sh
index d80d3f5..eb13064 100755
--- a/import-certs.sh
+++ b/import-certs.sh
@@ -10,8 +10,12 @@ SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BASEDIR="${SCRIPTDIR}"
 LETSENCRYPT="/etc/letsencrypt"
 
-# shellcheck disable=SC1090
-. "${SCRIPTDIR}/config.sh"
+eval "$("${SCRIPTDIR}/letsencrypt.sh" --env)"
+
+if [[ ! -e "${LETSENCRYPT}" ]]; then
+  echo "No existing letsencrypt files found."
+  exit 1
+fi
 
 if [[ -e "${BASEDIR}/domains.txt" ]]; then
   DOMAINS_TXT="${BASEDIR}/domains.txt"