From 201673ca8aabcd4becd90119b3d0118078daedee Mon Sep 17 00:00:00 2001
From: quthla <quthla@users.noreply.github.com>
Date: Mon, 11 Apr 2022 00:29:55 +0200
Subject: [PATCH 1/2] Store Mailcow deploy parameters

---
 deploy/mailcow.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/deploy/mailcow.sh b/deploy/mailcow.sh
index c3535e7e..987f358b 100644
--- a/deploy/mailcow.sh
+++ b/deploy/mailcow.sh
@@ -20,18 +20,26 @@ mailcow_deploy() {
   _debug _cca "$_cca"
   _debug _cfullchain "$_cfullchain"
 
-  _mailcow_path="${DEPLOY_MAILCOW_PATH}"
+  _getdeployconf DEPLOY_MAILCOW_PATH
+  _getdeployconf DEPLOY_MAILCOW_RELOAD
 
-  if [ -z "$_mailcow_path" ]; then
+  _debug DEPLOY_MAILCOW_PATH "$DEPLOY_MAILCOW_PATH"
+  _debug DEPLOY_MAILCOW_RELOAD "$DEPLOY_MAILCOW_RELOAD"
+
+  if [ -z "$DEPLOY_MAILCOW_PATH" ]; then
     _err "Mailcow path is not found, please define DEPLOY_MAILCOW_PATH."
     return 1
   fi
 
+  _savedeployconf DEPLOY_MAILCOW_PATH "$DEPLOY_MAILCOW_PATH"
+
+  [ -n "$DEPLOY_MAILCOW_RELOAD" ] && _savedeployconf DEPLOY_MAILCOW_RELOAD "$DEPLOY_MAILCOW_RELOAD"
+
   #Tests if _ssl_path is the mailcow root directory.
-  if [ -f "${_mailcow_path}/generate_config.sh" ]; then
-    _ssl_path="${_mailcow_path}/data/assets/ssl/"
+  if [ -f "$DEPLOY_MAILCOW_PATH/generate_config.sh" ]; then
+    _ssl_path="$DEPLOY_MAILCOW_PATH/data/assets/ssl/"
   else
-    _ssl_path="${_mailcow_path}"
+    _ssl_path="$DEPLOY_MAILCOW_PATH"
   fi
 
   if [ ! -d "$_ssl_path" ]; then
@@ -40,10 +48,7 @@ mailcow_deploy() {
   fi
 
   # ECC or RSA
-  if [ -z "${Le_Keylength}" ]; then
-    Le_Keylength=""
-  fi
-  if _isEccKey "${Le_Keylength}"; then
+  if _isEccKey "$Le_Keylength"; then
     _info "ECC key type detected"
     _cert_name_prefix="ecdsa-"
   else
@@ -63,7 +68,7 @@ mailcow_deploy() {
     return 1
   fi
 
-  DEFAULT_MAILCOW_RELOAD="docker restart $(docker ps -qaf name=postfix-mailcow); docker restart $(docker ps -qaf name=nginx-mailcow); docker restart $(docker ps -qaf name=dovecot-mailcow)"
+  DEFAULT_MAILCOW_RELOAD="docker restart \$(docker ps --quiet --filter name=nginx-mailcow --filter name=dovecot-mailcow)"
   _reload="${DEPLOY_MAILCOW_RELOAD:-$DEFAULT_MAILCOW_RELOAD}"
 
   _info "Run reload: $_reload"

From 08ae8cc3cb76e1877464875e26ac4d43af5ffc6b Mon Sep 17 00:00:00 2001
From: quthla <quthla@users.noreply.github.com>
Date: Mon, 11 Apr 2022 11:39:21 +0200
Subject: [PATCH 2/2] Fix

---
 deploy/mailcow.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/deploy/mailcow.sh b/deploy/mailcow.sh
index 987f358b..3492cea4 100644
--- a/deploy/mailcow.sh
+++ b/deploy/mailcow.sh
@@ -32,14 +32,11 @@ mailcow_deploy() {
   fi
 
   _savedeployconf DEPLOY_MAILCOW_PATH "$DEPLOY_MAILCOW_PATH"
-
   [ -n "$DEPLOY_MAILCOW_RELOAD" ] && _savedeployconf DEPLOY_MAILCOW_RELOAD "$DEPLOY_MAILCOW_RELOAD"
 
-  #Tests if _ssl_path is the mailcow root directory.
+  _ssl_path="$DEPLOY_MAILCOW_PATH"
   if [ -f "$DEPLOY_MAILCOW_PATH/generate_config.sh" ]; then
     _ssl_path="$DEPLOY_MAILCOW_PATH/data/assets/ssl/"
-  else
-    _ssl_path="$DEPLOY_MAILCOW_PATH"
   fi
 
   if [ ! -d "$_ssl_path" ]; then
@@ -48,13 +45,15 @@ mailcow_deploy() {
   fi
 
   # ECC or RSA
-  if _isEccKey "$Le_Keylength"; then
+  length=$(_readdomainconf Le_Keylength)
+  if _isEccKey "$length"; then
     _info "ECC key type detected"
     _cert_name_prefix="ecdsa-"
   else
     _info "RSA key type detected"
     _cert_name_prefix=""
   fi
+
   _info "Copying key and cert"
   _real_key="$_ssl_path/${_cert_name_prefix}key.pem"
   if ! cat "$_ckey" >"$_real_key"; then