This commit is contained in:
Pavel Muhortov 2023-05-12 12:08:00 +03:00
parent a3541096ee
commit a95605b61f

View File

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