From bb7ca4089bb2d63ffe6f71da904c79f53a8d1003 Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 27 Dec 2018 19:36:16 +0100 Subject: [PATCH] check_postfix.sh: fix error if distribution is not Debian or Ubuntu. --- check_postfix.sh | 82 +++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/check_postfix.sh b/check_postfix.sh index c65f28d..0d05292 100755 --- a/check_postfix.sh +++ b/check_postfix.sh @@ -181,29 +181,27 @@ if ! ps -e f | grep -E "[[:digit:]]\ ${check_string_ps}" | grep -v grep > /dev/n # - Don't Start/Stop Services if package management is running (apt,aptitude,dpkg) # - - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then - if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - warn "It seems that package management (apt,dpkg) is running. Exiting restarting the service .." + if ( [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ) \ + && $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then + warn "It seems that package management (apt,dpkg) is running. Exiting restarting the service .." + else + $systemctl stop postfix > /dev/null 2> ${LOCK_DIR}/err_msg.log + if [[ $? -ne 0 ]]; then + error "$(cat ${LOCK_DIR}/err_msg.log)" + fi + + sleep 10 + + # - Don't Start/Stop Services if package management is running (apt,aptitude,dpkg) + # - + if ( [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ) \ + && $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then + warn "It seems that package management (apt,dpkg) is running. Omit starting the service .." else - $systemctl stop postfix > /dev/null 2> ${LOCK_DIR}/err_msg.log + $systemctl start postfix > /dev/null 2> ${LOCK_DIR}/err_msg.log if [[ $? -ne 0 ]]; then error "$(cat ${LOCK_DIR}/err_msg.log)" fi - - sleep 10 - - # - Don't Start/Stop Services if package management is running (apt,aptitude,dpkg) - # - - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then - if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - warn "It seems that package management (apt,dpkg) is running. Omit starting the service .." - else - $systemctl start postfix > /dev/null 2> ${LOCK_DIR}/err_msg.log - if [[ $? -ne 0 ]]; then - error "$(cat ${LOCK_DIR}/err_msg.log)" - fi - fi - fi fi fi @@ -211,31 +209,29 @@ if ! ps -e f | grep -E "[[:digit:]]\ ${check_string_ps}" | grep -v grep > /dev/n # - Don't Start/Stop Services if package management is running (apt,aptitude,dpkg) # - - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then - if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - warn "It seems that package management (apt,dpkg) is running - Exiting restarting the service .." - else - $postfix_init_script stop > /dev/null 2>&1 - if [[ $? -ne 0 ]]; then - error "Stopping Postfix Mailservice failed!" - fi - - sleep 10 - - # - Don't Start/Stop Services if package management is running (apt,aptitude,dpkg) - # - - if [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ; then - if $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then - warn "It seems that package management (apt,dpkg) is running. Omit starting the service .." - else - $postfix_init_script start > /dev/null 2>&1 - if [[ $? -ne 0 ]]; then - error "Starting Postfix Mailservice failed!" - fi - fi - fi - + if ( [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ) \ + && $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then + warn "It seems that package management (apt,dpkg) is running - Exiting restarting the service .." + else + $postfix_init_script stop > /dev/null 2>&1 + if [[ $? -ne 0 ]]; then + error "Stopping Postfix Mailservice failed!" fi + + sleep 10 + + # - Don't Start/Stop Services if package management is running (apt,aptitude,dpkg) + # - + if ( [[ "${os_dist,,}" = "debian" ]] || [[ "${os_dist,,}" = "ubuntu" ]] ) \ + && $(lsof /var/lib/dpkg/lock >/dev/null 2>&1) ; then + warn "It seems that package management (apt,dpkg) is running. Omit starting the service .." + else + $postfix_init_script start > /dev/null 2>&1 + if [[ $? -ne 0 ]]; then + error "Starting Postfix Mailservice failed!" + fi + fi + fi fi