[checkmk-commits] 3909 FIX postfix_mailq: fixed readout postfix config

Module: check_mk Branch: master Commit: 615065d2cd5924675327fca8b1aa125adddeb449 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=615065d2cd5924… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 6 10:55:19 2016 +0200 3909 FIX postfix_mailq: fixed readout postfix config --- .werks/3909 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3909 b/.werks/3909 new file mode 100644 index 0000000..4e8a00a --- /dev/null +++ b/.werks/3909 @@ -0,0 +1,10 @@ +Title: postfix_mailq: fixed readout postfix config +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i2 +Date: 1475744029 + + diff --git a/ChangeLog b/ChangeLog index 7552d5a..19fb355 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * 3894 FIX: mkeventd_status: Fixed bug in case Event Console is not running * 3907 FIX: oracle_tablespaces: simplyfied free space calculation depending on version... * 3819 FIX: windows agent: fixed 2 bugs related to mrpe... + * 3909 FIX: postfix_mailq: fixed readout postfix config WATO: * 3915 User access times: New icon when never logged in; New column "last seen" diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 72b2e45..ab4adc5 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -646,7 +646,7 @@ function read_postfix_queue_dirs { if type postconf >/dev/null ; then # Check if multi_instance_directories exists in main.cf and is not empty # always takes the last entry, multiple entries possible - multi_instances_dirs=$(postconf -d multi_instance_directories 2>/dev/null | sed 's/.*=[[:space:]]*//g') + multi_instances_dirs=$(postconf -c /etc/postfix 2>/dev/null | grep ^multi_instance_directories | sed 's/.*=[[:space:]]*//g') if [ ! -z "$multi_instances_dirs" ]; then for queue_dir in $multi_instances_dirs do