[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 96b686bbab6223f7af81b37071ecb11360d22aaa

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 84fc3f72872b483f7729d24bcf5c4b737e00b006
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Aug 11 07:19:24 2011 +0200

    Fix installation path for objects and templates in *-nagios3 package
    
    Closes: #634016
    Thanks: Richard James Salts for the patch

diff --git a/debian/check-mk-config-nagios3.install b/debian/check-mk-config-nagios3.install
index f507c7b..51e618d 100644
--- a/debian/check-mk-config-nagios3.install
+++ b/debian/check-mk-config-nagios3.install
@@ -1,2 +1,2 @@
-usr/share/doc/check_mk/check_mk_templates.cfg etc/icinga/objects
+usr/share/doc/check_mk/check_mk_templates.cfg etc/nagios3/objects
 etc/check_mk/multisite.mk
diff --git a/debian/defaults.nagios3 b/debian/defaults.nagios3
index a01d038..edd115e 100644
--- a/debian/defaults.nagios3
+++ b/debian/defaults.nagios3
@@ -22,7 +22,7 @@ precompiled_hostchecks_dir  = '/var/lib/check_mk/precompiled'
 counters_directory          = '/var/lib/check_mk/counters'
 tcp_cache_dir               = '/var/lib/check_mk/cache'
 logwatch_dir                = '/var/lib/check_mk/logwatch'
-nagios_objects_file         = '/etc/nagios/conf.d/check_mk_objects.cfg'
+nagios_objects_file         = '/etc/nagios3/conf.d/check_mk_objects.cfg'
 rrd_path                    = '/var/lib/check_mk/rrd'
 nagios_command_pipe_path    = '/var/lib/nagios3/rw/nagios.cmd'
 nagios_status_file          = '/var/cache/nagios3/status.dat'

-- 
UNNAMED PROJECT