fixed BASEDIR dependent default config values

[andy/dehydrated.git] / letsencrypt.sh

diff --git a/letsencrypt.sh b/letsencrypt.sh
index f2f297b7377d0f8bb5170bab168a95d160159d98..124b53258bfaa340bf7bb6600b6d90b71ec73c86 100755 (executable)
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -18,6 +18,17 @@ check_dependencies() {
 
 # Setup default config values, search for and load configuration files
 load_config() {
+  # Check for config in various locations
+  if [[ -z "${CONFIG:-}" ]]; then
+    for check_config in "/etc/letsencrypt.sh" "/usr/local/etc/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
+      if [[ -e "${check_config}/config.sh" ]]; then
+        BASEDIR="${check_config}"
+        CONFIG="${check_config}/config.sh"
+        break
+      fi
+    done
+  fi
+
   # Default values
   CA="https://acme-v01.api.letsencrypt.org/directory"
   LICENSE="https://letsencrypt.org/documents/LE-SA-v1.0.1-July-27-2015.pdf"
@@ -31,17 +42,6 @@ load_config() {
   CONTACT_EMAIL=
   LOCKFILE="${BASEDIR}/lock"
 
-  # Check for config in various locations
-  if [[ -z "${CONFIG:-}" ]]; then
-    for check_config in "/etc/letsencrypt.sh" "/usr/local/etc/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
-      if [[ -e "${check_config}/config.sh" ]]; then
-        BASEDIR="${check_config}"
-        CONFIG="${check_config}/config.sh"
-        break
-      fi
-    done
-  fi
-
   if [[ -z "${CONFIG:-}" ]]; then
     echo "#" >&2
     echo "# !! WARNING !! No config file found, using default config!" >&2