From ed8e37452102d3b4ff2605500995b29dfae42fc03a6af6addf4fe486b78e2bc1 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Tue, 10 Sep 2013 17:13:25 +0000 Subject: [PATCH] - adapt check_mk directories for icinga usage OBS-URL: https://build.opensuse.org/package/show/server:monitoring/nagios-rpm-macros?expand=0&rev=36 --- macros.check_mk | 4 ++++ nagios-rpm-macros.changes | 5 +++++ nagios-rpm-macros.spec | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/macros.check_mk b/macros.check_mk index c9964e5..a94dead 100644 --- a/macros.check_mk +++ b/macros.check_mk @@ -33,7 +33,11 @@ %livestatus_agentsconfdir %{livestatus_sysconfdir} # htdocsdir %livestatus_htdocsdir %{nagios_datadir} +# htdocsdir for icinga +%livestatus_icinga_htdocsdir %{icinga_datadir} # nagconfdir %livestatus_nagconfdir %{nagios_sysconfdir}/check_mk.d +# nagconfdir for icinga +%livestatus_icinga_confdir %{icinga_sysconfdir}/check_mk.d # rrddir %livestatus_rrddir %{livestatus_libdir}/rrd diff --git a/nagios-rpm-macros.changes b/nagios-rpm-macros.changes index 00640e5..910c8d2 100644 --- a/nagios-rpm-macros.changes +++ b/nagios-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 10 17:11:47 UTC 2013 - lars@linux-schulserver.de + +- adapt check_mk directories for icinga usage + ------------------------------------------------------------------- Wed Aug 7 20:56:02 UTC 2013 - lars@linux-schulserver.de diff --git a/nagios-rpm-macros.spec b/nagios-rpm-macros.spec index d3849dc..0a5d574 100644 --- a/nagios-rpm-macros.spec +++ b/nagios-rpm-macros.spec @@ -20,7 +20,7 @@ Name: nagios-rpm-macros Summary: RPM Macros for Nagios based packages License: BSD-3-Clause Group: System/Monitoring -Version: 0.07 +Version: 0.08 Release: 0 Url: http://en.opensuse.org/Nagios Source0: macros.nagios