diff --git a/zimbra-man.sh b/zimbra-man.sh index 09bf7e7..456a9ad 100644 --- a/zimbra-man.sh +++ b/zimbra-man.sh @@ -139,7 +139,7 @@ isrunning(){ if ! grep -q "$(cat /etc/hostname)" <<< "${service}"; then if grep -q "Stopped" <<< "${service}"; then (( counter++ )) - fi + fi fi done <<< "$(su - zimbra -c '/opt/zimbra/bin/zmcontrol status')" printf "%s\n" "${counter}" @@ -186,11 +186,11 @@ certrenew() { # zimbra cert deploy cp "/etc/letsencrypt/live/${certfirst}/privkey.pem" /opt/zimbra/ssl/zimbra/commercial/commercial.key - cp "/etc/letsencrypt/live/${certfirst}/chain.pem" /opt/zimbra/ssl/zimbra/commercial/chain.pem - cp "/etc/letsencrypt/live/${certfirst}/cert.pem" /opt/zimbra/ssl/zimbra/commercial/cert.pem - chown -R zimbra:zimbra /opt/zimbra/ssl/zimbra/commercial/ - su - zimbra -c "/opt/zimbra/bin/zmcertmgr verifycrt comm /opt/zimbra/ssl/zimbra/commercial/commercial.key /opt/zimbra/ssl/zimbra/commercial/cert.pem /opt/zimbra/ssl/zimbra/commercial/chain.pem" - su - zimbra -c "/opt/zimbra/bin/zmcertmgr deploycrt comm /opt/zimbra/ssl/zimbra/commercial/cert.pem /opt/zimbra/ssl/zimbra/commercial/chain.pem" + cp "/etc/letsencrypt/live/${certfirst}/chain.pem" /opt/zimbra/ssl/zimbra/commercial/chain.pem + cp "/etc/letsencrypt/live/${certfirst}/cert.pem" /opt/zimbra/ssl/zimbra/commercial/cert.pem + chown -R zimbra:zimbra /opt/zimbra/ssl/zimbra/commercial/ + su - zimbra -c "/opt/zimbra/bin/zmcertmgr verifycrt comm /opt/zimbra/ssl/zimbra/commercial/commercial.key /opt/zimbra/ssl/zimbra/commercial/cert.pem /opt/zimbra/ssl/zimbra/commercial/chain.pem" + su - zimbra -c "/opt/zimbra/bin/zmcertmgr deploycrt comm /opt/zimbra/ssl/zimbra/commercial/cert.pem /opt/zimbra/ssl/zimbra/commercial/chain.pem" su - zimbra -c "/opt/zimbra/bin/zmcontrol restart" } @@ -203,7 +203,7 @@ certrenew() { # None ####################################### startsendmail() { - subj="[SSL Status] $(cat /etc/hostname): certificates did renew" + subj="[SSL Status] $(cat /etc/hostname): certificates renewed" ( "${python3}" /usr/local/bin/sendmail.py \ -u "$(grep "from=" /usr/local/bin/sendmail.config | cut -d= -f2)" \