Module: check_mk Branch: master Commit: a3221e547ffb8f9f59208884968dc19a3fa167cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3221e547ffb8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 3 15:12:57 2013 +0200 FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf Conflicts: ChangeLog --- ChangeLog | 6 ++++++ agents/plugins/apache_status | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b801f4..8595e02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,12 @@ * Inventory: Display link symbol for ps ruleset * FIX: Rulesets: correct display of rules within subfolders + +1.2.2p2: + Checks & Agents: + * FIX: apache_status: use (also) apache_status.cfg instead of apache_status.conf + + 1.2.2p1: Core: * FIX: correctly quote ! and \ in active checks for Nagios diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index ca70602..71d1f61 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -12,7 +12,7 @@ # # By default this plugin tries to detect all locally running apache processes # and to monitor them. If this is not good for your environment you might -# create an apache_status.conf file in MK_CONFDIR and populate the servers +# create an apache_status.cfg file in MK_CONFDIR and populate the servers # list to prevent executing the detection mechanism. # # It is also possible to override or extend the ssl_ports variable to make the @@ -20,9 +20,14 @@ import os, sys, urllib2 -config_file = os.getenv("MK_CONFDIR", "/etc/check_mk") + "/apache_status.conf" +config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") +config_file = config_dir + "/apache_status.conf" +if not os.path.exists(config_file): + config_file = config_dir + "/apache_status.cfg" -# None or list of (ipaddress, port) tuples + +# None or list of (proto, ipaddress, port) tuples. +# proto is 'http' or 'https' servers = None ssl_ports = [ 443, ]