[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 0c3827aca406859bd5d5512224a0c0a3cfa685d2

[Bernd Zeimetz]

The following commit has been merged in the master branch:
commit d1ec4b9fc7bca1a8c30a55eb827c0fe0a359f8e6
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Wed Nov 9 19:46:57 2011 +0100

    Updating defaults files to 1.1.12

diff --git a/debian/defaults.icinga b/debian/defaults.icinga
index 4c9b776..9b40f42 100644
--- a/debian/defaults.icinga
+++ b/debian/defaults.icinga
@@ -7,12 +7,13 @@
 # and enter new values when asked, or edit ~/.check_mk_setup.conf and
 # run ./setup.sh --yes.
 
-check_mk_version            = '1.1.10'
+check_mk_version            = '1.1.12'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
 checks_dir                  = '/usr/share/check_mk/checks'
 check_manpages_dir          = '/usr/share/doc/check_mk/checks'
 modules_dir                 = '/usr/share/check_mk/modules'
+locale_dir                  = '/usr/share/check_mk/locale'
 agents_dir                  = '/usr/share/check_mk/agents'
 var_dir                     = '/var/lib/check_mk'
 lib_dir                     = '/usr/lib/check_mk'
@@ -23,7 +24,6 @@ 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/icinga/objects/check_mk_objects.cfg'
-rrd_path                    = '/var/lib/check_mk/rrd'
 nagios_command_pipe_path    = '/var/lib/icinga/rw/icinga.cmd'
 nagios_status_file          = '/var/lib/icinga/status.dat'
 nagios_conf_dir             = '/etc/icinga/objects'
@@ -47,3 +47,4 @@ pnp_url                     = '/pnp4nagios/'
 pnp_templates_dir           = '/usr/share/check_mk/pnp-templates'
 pnp_rraconf_dir             = '/usr/share/check_mk/pnp-rraconf'
 doc_dir                     = '/usr/share/doc/check_mk'
+check_mk_automation         = 'sudo -u nagios /usr/bin/check_mk --automation'
diff --git a/debian/defaults.nagios3 b/debian/defaults.nagios3
index edd115e..21b55e8 100644
--- a/debian/defaults.nagios3
+++ b/debian/defaults.nagios3
@@ -7,12 +7,13 @@
 # and enter new values when asked, or edit ~/.check_mk_setup.conf and
 # run ./setup.sh --yes.
 
-check_mk_version            = '1.1.10'
+check_mk_version            = '1.1.12'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
 checks_dir                  = '/usr/share/check_mk/checks'
 check_manpages_dir          = '/usr/share/doc/check_mk/checks'
 modules_dir                 = '/usr/share/check_mk/modules'
+locale_dir                  = '/usr/share/check_mk/locale'
 agents_dir                  = '/usr/share/check_mk/agents'
 var_dir                     = '/var/lib/check_mk'
 lib_dir                     = '/usr/lib/check_mk'
@@ -23,7 +24,6 @@ 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/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'
 nagios_conf_dir             = '/etc/nagios3/conf.d'
@@ -47,3 +47,4 @@ pnp_url                     = '/pnp4nagios/'
 pnp_templates_dir           = '/usr/share/check_mk/pnp-templates'
 pnp_rraconf_dir             = '/usr/share/check_mk/pnp-rraconf'
 doc_dir                     = '/usr/share/doc/check_mk'
+check_mk_automation         = 'sudo -u nagios /usr/bin/check_mk --automation'

-- 
UNNAMED PROJECT