Rename ICINGA2_PLUGIN_PATH to ICINGA2_PLUGINDIR

refs #6548

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 449f42f256562a41fb16ec4ed1b8b2dea70a8ecb..af48befee3c567471520ace1ae636ab17df19e3f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ set(ICINGA2_GROUP "icinga" CACHE STRING "Icinga 2 group")
 set(ICINGA2_COMMAND_USER "icinga" CACHE STRING "Icinga 2 command user")
 set(ICINGA2_COMMAND_GROUP "icingacmd" CACHE STRING "Icinga 2 command group")
 set(ICINGA2_RUNDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run" CACHE STRING "/run directory")
-set(ICINGA2_PLUGIN_PATH "/usr/lib/nagios/plugins" CACHE STRING "Path for the check plugins")
+set(ICINGA2_PLUGINDIR "/usr/lib/nagios/plugins" CACHE STRING "Path for the check plugins")
 set(ICINGA2_GIT_VERSION_INFO ON CACHE BOOL "Whether to use git describe")
 
 file(READ "${CMAKE_CURRENT_SOURCE_DIR}/COPYING" ICINGA2_LICENSE_GPL)

diff --git a/INSTALL b/INSTALL
index a3e0245f2a159194c59a666876ef402b5e47df74..ce3c3aff43b20175a2337f0ea7a7b76f0d0f2e85 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -126,7 +126,7 @@ variables are supported:
 - ICINGA2_COMMAND_USER: The command user Icinga 2 should use; defaults to "icinga"
 - ICINGA2_GIT_VERSION_INFO: Whether to use Git to determine the version number; defaults to "ON"
 - ICINGA2_COMMAND_GROUP: The command group Icinga 2 should use; defaults to "icingacmd"
-- ICINGA2_PLUGIN_PATH: The path for the Monitoring Plugins project binaries; defaults to "/usr/lib/nagios/plugins"
+- ICINGA2_PLUGINDIR: The path for the Monitoring Plugins project binaries; defaults to "/usr/lib/nagios/plugins"
 - ICINGA2_RUNDIR: The location of the "run" directory; defaults to CMAKE_INSTALL_LOCALSTATEDIR/run
 - CMAKE_INSTALL_SYSCONFDIR: The configuration directory; defaults to CMAKE_INSTALL_PREFIX/etc
 - ICINGA2_SYSCONFIGFILE: Where to put the config file the initscript/systemd pulls it's dirs from; 

diff --git a/debian/rules b/debian/rules
index 2a6e20d0483aef3dba0303db86f149f0d0a0a31a..49dd1bd535aa1ec813362b0db8f2b34fc94901b2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_auto_configure:
                -DICINGA2_GROUP=nagios \
                -DICINGA2_COMMAND_USER=nagios \
                -DICINGA2_COMMAND_GROUP=www-data \
-               -DICINGA2_PLUGIN_PATH=/usr/lib/nagios/plugins
+               -DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins
 
 override_dh_auto_install:
        dh_auto_install

diff --git a/etc/icinga2/constants.conf.cmake b/etc/icinga2/constants.conf.cmake
index cee504b508c3e95aa3397ce4e2a510248b32a585..b8951929d14728016a61ac89ef1c75b17b6b782b 100644 (file)
--- a/etc/icinga2/constants.conf.cmake
+++ b/etc/icinga2/constants.conf.cmake
@@ -4,7 +4,7 @@
  */
 
 /* The directory which contains the plugins from the Monitoring Plugins project. */
-const PluginDir = "@ICINGA2_PLUGIN_PATH@"
+const PluginDir = "@ICINGA2_PLUGINDIR@"
 
 /* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
  * This should be the common name from the API certificate.

diff --git a/icinga2.spec b/icinga2.spec
index 922434937111ef33228a13b76c427dd0200542f1..6fa099bc37345b53209b122634a9930707530567 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -257,9 +257,9 @@ CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=/usr/lib/boost141 \
 %endif
 
 %if "%{_vendor}" != "suse"
-CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGIN_PATH=%{_libdir}/nagios/plugins"
+CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{_libdir}/nagios/plugins"
 %else
-CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGIN_PATH=%{_prefix}/lib/nagios/plugins"
+CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{_prefix}/lib/nagios/plugins"
 %endif
 
 %if 0%{?use_systemd}