From: Lukas Schauer <lukas@schauer.so>
Date: Tue, 6 Feb 2018 19:40:32 +0000 (+0100)
Subject: Create required certificate and chaincache directories outside of sign_domain
X-Git-Tag: v0.6.0~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73a116e879186c45fd74d3eef1833f76bc177d94;p=thirdparty%2Fdehydrated.git

Create required certificate and chaincache directories outside of sign_domain
---

diff --git a/dehydrated b/dehydrated
index 5cecfa7..a3e7aff 100755
--- a/dehydrated
+++ b/dehydrated
@@ -880,15 +880,6 @@ sign_domain() {
     _exiterr "Certificate authority doesn't allow certificate signing"
   fi
 
-  # If there is no existing certificate directory => make it
-  if [[ ! -e "${certdir}" ]]; then
-    echo " + Creating new directory ${certdir} ..."
-    mkdir -p "${certdir}" || _exiterr "Unable to create directory ${certdir}"
-  fi
-  if [ ! -d "${CHAINCACHE}" ]; then
-    echo " + Creating chain cache directory ${CHAINCACHE}"
-    mkdir "${CHAINCACHE}"
-  fi
 
   privkey="privkey.pem"
   # generate a new private key if we need or want one
@@ -1078,6 +1069,11 @@ command_sign_domains() {
   init_system
   [[ -n "${HOOK}" ]] && "${HOOK}" "startup_hook"
 
+  if [ ! -d "${CHAINCACHE}" ]; then
+    echo " + Creating chain cache directory ${CHAINCACHE}"
+    mkdir "${CHAINCACHE}"
+  fi
+
   if [[ -n "${PARAM_DOMAIN:-}" ]]; then
     DOMAINS_TXT="$(_mktemp)"
     if [[ -n "${PARAM_ALIAS:-}" ]]; then
@@ -1123,6 +1119,12 @@ command_sign_domains() {
       echo "Processing ${domain} with alternative names: ${morenames}"
     fi
 
+    # If there is no existing certificate directory => make it
+    if [[ ! -e "${certdir}" ]]; then
+      echo " + Creating new directory ${certdir} ..."
+      mkdir -p "${certdir}" || _exiterr "Unable to create directory ${certdir}"
+    fi
+
     # read cert config
     # for now this loads the certificate specific config in a subshell and parses a diff of set variables.
     # we could just source the config file but i decided to go this way to protect people from accidentally overriding