use config vars from letsencrypt.sh in import-script

62037de0 · Lukas Schauer · 3ba233de · 62037de0
Commit 62037de0 authored Dec 14, 2015 by Lukas Schauer
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

import-certs.sh import-certs.sh +6 -2

No files found.
--- 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"