nihilist/acme.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
neil 2020-12-07 21:41:08 +08:00
parent a0c2d312e9
commit 32b62d6d4f
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deploy/mailcow.sh
View File

@ -27,11 +27,11 @@ mailcow_deploy() {
return 1 return 1
fi fi
#Tests if _ssl_path is the mailcow root directory. #Tests if _ssl_path is the mailcow root directory.
if [ -f "${_mailcow_path}/generate_config.sh" ]; then if [ -f "${_mailcow_path}/generate_config.sh" ]; then
_ssl_path="${_mailcow_path}/data/assets/ssl/" _ssl_path="${_mailcow_path}/data/assets/ssl/"
else else
_ssl_path="${_mailcow_path}" _ssl_path="${_mailcow_path}"
fi fi
if [ ! -d "$_ssl_path" ]; then if [ ! -d "$_ssl_path" ]; then
@ -41,17 +41,16 @@ mailcow_deploy() {
# ECC or RSA # ECC or RSA
if [ -z "${Le_Keylength}" ]; then if [ -z "${Le_Keylength}" ]; then
Le_Keylength="" Le_Keylength=""
fi fi
if _isEccKey "${Le_Keylength}"; then if _isEccKey "${Le_Keylength}"; then
_info "ECC key type detected" _info "ECC key type detected"
_cert_type="ecdsa" _cert_type="ecdsa"
_cert_name_prefix="ecdsa-" _cert_name_prefix="ecdsa-"
else else
_info "RSA key type detected" _info "RSA key type detected"
_cert_type="rsa" _cert_type="rsa"
_cert_name_prefix="" _cert_name_prefix=""
fi fi
_info "Copying key and cert" _info "Copying key and cert"
_real_key="$_ssl_path/${_cert_name_prefix}key.pem" _real_key="$_ssl_path/${_cert_name_prefix}key.pem"