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

[Sven Velt]

The following commit has been merged in the master branch:
commit f9ccf4dc5967e39e417c4b48a80d66a513205b99
Author: Sven Velt <sven at velt.de>
Date:   Sun May 29 14:32:05 2011 +0200

    Update "defaults" variable file to 1.1.10

diff --git a/debian/defaults.icinga b/debian/defaults.icinga
index 4c21822..4c9b776 100644
--- a/debian/defaults.icinga
+++ b/debian/defaults.icinga
@@ -7,7 +7,7 @@
 # and enter new values when asked, or edit ~/.check_mk_setup.conf and
 # run ./setup.sh --yes.
 
-check_mk_version            = '1.1.8'
+check_mk_version            = '1.1.10'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
 checks_dir                  = '/usr/share/check_mk/checks'
@@ -16,6 +16,7 @@ modules_dir                 = '/usr/share/check_mk/modules'
 agents_dir                  = '/usr/share/check_mk/agents'
 var_dir                     = '/var/lib/check_mk'
 lib_dir                     = '/usr/lib/check_mk'
+snmpwalks_dir               = '/var/lib/check_mk/snmpwalks'
 autochecksdir               = '/var/lib/check_mk/autochecks'
 precompiled_hostchecks_dir  = '/var/lib/check_mk/precompiled'
 counters_directory          = '/var/lib/check_mk/counters'
@@ -41,6 +42,8 @@ web_dir                     = '/usr/share/check_mk/web'
 checkmk_web_uri             = '/check_mk'
 livestatus_unix_socket      = '/var/lib/icinga/rw/live'
 livebackendsdir             = '/usr/share/check_mk/livestatus'
+url_prefix                  = '/'
 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'
diff --git a/debian/defaults.nagios3 b/debian/defaults.nagios3
index 762ec05..a01d038 100644
--- a/debian/defaults.nagios3
+++ b/debian/defaults.nagios3
@@ -7,7 +7,7 @@
 # and enter new values when asked, or edit ~/.check_mk_setup.conf and
 # run ./setup.sh --yes.
 
-check_mk_version            = '1.1.8'
+check_mk_version            = '1.1.10'
 default_config_dir          = '/etc/check_mk'
 check_mk_configdir          = '/etc/check_mk/conf.d'
 checks_dir                  = '/usr/share/check_mk/checks'
@@ -16,6 +16,7 @@ modules_dir                 = '/usr/share/check_mk/modules'
 agents_dir                  = '/usr/share/check_mk/agents'
 var_dir                     = '/var/lib/check_mk'
 lib_dir                     = '/usr/lib/check_mk'
+snmpwalks_dir               = '/var/lib/check_mk/snmpwalks'
 autochecksdir               = '/var/lib/check_mk/autochecks'
 precompiled_hostchecks_dir  = '/var/lib/check_mk/precompiled'
 counters_directory          = '/var/lib/check_mk/counters'
@@ -41,6 +42,8 @@ web_dir                     = '/usr/share/check_mk/web'
 checkmk_web_uri             = '/check_mk'
 livestatus_unix_socket      = '/var/lib/nagios3/rw/live'
 livebackendsdir             = '/usr/share/check_mk/livestatus'
+url_prefix                  = '/'
 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'

-- 
UNNAMED PROJECT