[Pkg-nagios-changes] [pkg-check-mk] 04/09: Update defaults

[Alexander Wirt]

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

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

commit 6c799894b0d1c68d57c3e72c273c57a5e85b6552
Author: Thomas Bechtold <thomasbechtold at jpberlin.de>
Date:   Wed Aug 7 11:36:00 2013 +0200

    Update defaults
---
 debian/changelog        |    1 +
 debian/defaults.icinga  |    5 ++++-
 debian/defaults.nagios3 |    5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51bc562..ce0b3df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 check-mk (1.2.2p2-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #678396).
+  * Update defaults in debian/defaults.nagios3 and debian/defaults.icinga.
 
  -- Thomas Bechtold <t.bechtold at telekom.de>  Wed, 07 Aug 2013 09:39:46 +0200
 
diff --git a/debian/defaults.icinga b/debian/defaults.icinga
index 5fbf73c..06e0c79 100644
--- a/debian/defaults.icinga
+++ b/debian/defaults.icinga
@@ -7,10 +7,12 @@
 # and enter new values when asked, or edit ~/.check_mk_setup.conf and
 # run ./setup.sh --yes.
 
-check_mk_version            = '1.1.12p7'
+check_mk_version            = '1.2.2p2'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
+share_dir		    = '/usr/share/check_mk'
 checks_dir                  = '/usr/share/check_mk/checks'
+notifications_dir	    = '/usr/share/check_mk/notifications'
 check_manpages_dir          = '/usr/share/check_mk/checks-man'
 modules_dir                 = '/usr/share/check_mk/modules'
 locale_dir                  = '/usr/share/check_mk/locale'
@@ -25,6 +27,7 @@ tcp_cache_dir               = '/var/lib/check_mk/cache'
 logwatch_dir                = '/var/lib/check_mk/logwatch'
 nagios_objects_file         = '/etc/icinga/objects/check_mk/check_mk_objects.cfg'
 nagios_command_pipe_path    = '/var/lib/icinga/rw/icinga.cmd'
+check_result_path	    = '/var/lib/icinga/spool/checkresults'
 nagios_status_file          = '/var/lib/icinga/status.dat'
 nagios_conf_dir             = '/etc/icinga/objects/check_mk'
 nagios_user                 = 'nagios'
diff --git a/debian/defaults.nagios3 b/debian/defaults.nagios3
index 55302f1..33e7a5d 100644
--- a/debian/defaults.nagios3
+++ b/debian/defaults.nagios3
@@ -7,10 +7,12 @@
 # and enter new values when asked, or edit ~/.check_mk_setup.conf and
 # run ./setup.sh --yes.
 
-check_mk_version            = '1.1.12p7'
+check_mk_version            = '1.2.2p2'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
+share_dir		    = '/usr/share/check_mk'
 checks_dir                  = '/usr/share/check_mk/checks'
+notifications_dir	    = '/usr/share/check_mk/notifications'
 check_manpages_dir          = '/usr/share/check_mk/checks-man'
 modules_dir                 = '/usr/share/check_mk/modules'
 locale_dir                  = '/usr/share/check_mk/locale'
@@ -25,6 +27,7 @@ tcp_cache_dir               = '/var/lib/check_mk/cache'
 logwatch_dir                = '/var/lib/check_mk/logwatch'
 nagios_objects_file         = '/etc/nagios3/conf.d/check_mk/check_mk_objects.cfg'
 nagios_command_pipe_path    = '/var/lib/nagios3/rw/nagios.cmd'
+check_result_path	    = '/var/lib/nagios3/spool/checkresults'
 nagios_status_file          = '/var/cache/nagios3/status.dat'
 nagios_conf_dir             = '/etc/nagios3/conf.d'
 nagios_user                 = 'nagios'

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