[Pkg-nagios-changes] [pkg-check-mk] 01/02: override nagios paths for icinga config

[Matt Taggart]

This is an automated email from the git hooks/post-receive script.

taggart pushed a commit to branch master
in repository pkg-check-mk.

commit 6c0e52a82d0d451d9dc7778d24c0bfd710c6b12d
Author: Matt Taggart <taggart at debian.org>
Date:   Mon Aug 7 08:07:31 2017 -0700

    override nagios paths for icinga config
---
 debian/paths.py.icinga | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/paths.py.icinga b/debian/paths.py.icinga
index 7092d45..8dacb2f 100644
--- a/debian/paths.py.icinga
+++ b/debian/paths.py.icinga
@@ -127,11 +127,11 @@ def _set_paths():
         "tcp_cache_dir"               : os.path.join(omd_root, "tmp/check_mk/cache"),
         "tmp_dir"                     : os.path.join(omd_root, "tmp/check_mk"),
         "logwatch_dir"                : os.path.join(omd_root, "var/check_mk/logwatch"),
-        "nagios_startscript"          : os.path.join(omd_root, "etc/init.d/core"),
+        "nagios_startscript"          : os.path.join(omd_root, "etc/init.d/iginga"),
 
         # Switched via symlinks on icinga/nagios change
-        "nagios_conf_dir"             : os.path.join(omd_root, "etc/nagios/conf.d"),
-        "nagios_objects_file"         : os.path.join(omd_root, "etc/nagios/conf.d/check_mk_objects.cfg"),
+        "nagios_conf_dir"             : os.path.join(omd_root, "etc/icinga/conf.d"),
+        "nagios_objects_file"         : os.path.join(omd_root, "etc/icinga/conf.d/check_mk_objects.cfg"),
         "check_result_path"           : os.path.join(omd_root, "tmp/nagios/checkresults"),
         "nagios_status_file"          : os.path.join(omd_root, "tmp/nagios/status.dat"),
 
@@ -167,9 +167,11 @@ def _set_core_specific_paths():
         })
     else:
         globals().update({
-            "nagios_binary"               : os.path.join(omd_root, "bin/nagios"),
-            "nagios_config_file"          : os.path.join(omd_root, "tmp/nagios/nagios.cfg"),
-            "nagios_command_pipe_path"    : os.path.join(omd_root, "tmp/run/nagios.cmd"),
+            # debian override of default for icinga, to avoid needing an
+	    # etc/omd/site.conf
+            "nagios_binary"               : os.path.join(omd_root, "bin/icinga"),
+            "nagios_config_file"          : os.path.join(omd_root, "tmp/icinga/nagios.cfg"),
+            "nagios_command_pipe_path"    : os.path.join(omd_root, "tmp/run/icinga.cmd"),
         })
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-check-mk.git