plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-11-08 23:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
quthla 2022-04-11 11:39:21 +02:00 committed by GitHub
parent 201673ca8a
commit 08ae8cc3cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deploy/mailcow.sh
View File

@ -32,14 +32,11 @@ mailcow_deploy() {
fi fi
_savedeployconf DEPLOY_MAILCOW_PATH "$DEPLOY_MAILCOW_PATH" _savedeployconf DEPLOY_MAILCOW_PATH "$DEPLOY_MAILCOW_PATH"
[ -n "$DEPLOY_MAILCOW_RELOAD" ] && _savedeployconf DEPLOY_MAILCOW_RELOAD "$DEPLOY_MAILCOW_RELOAD" [ -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 if [ -f "$DEPLOY_MAILCOW_PATH/generate_config.sh" ]; then
_ssl_path="$DEPLOY_MAILCOW_PATH/data/assets/ssl/" _ssl_path="$DEPLOY_MAILCOW_PATH/data/assets/ssl/"
else
_ssl_path="$DEPLOY_MAILCOW_PATH"
fi fi
if [ ! -d "$_ssl_path" ]; then if [ ! -d "$_ssl_path" ]; then
@ -48,13 +45,15 @@ mailcow_deploy() {
fi fi
# ECC or RSA # ECC or RSA
if _isEccKey "$Le_Keylength"; then length=$(_readdomainconf Le_Keylength)
if _isEccKey "$length"; then
_info "ECC key type detected" _info "ECC key type detected"
_cert_name_prefix="ecdsa-" _cert_name_prefix="ecdsa-"
else else
_info "RSA key type detected" _info "RSA key type detected"
_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"
if ! cat "$_ckey" >"$_real_key"; then if ! cat "$_ckey" >"$_real_key"; then