Package: check-mk-server
Version: 1.1.12-1
Severity: wishlist
Hi,
I've been running 1.1.13i3 in a proof of concept environment and thought
I'd send you the patch I've been using for this - it's mostly removing
obsolete configuration variables, although there were some path changes
as well. I see the "compressed docs" problem has been fixed in your
1.1.12p7 package.
Thanks,
Adrian
diff -Naur check_mk-1.1.13i3.orig//debian/changelog check_mk-1.1.13i3//debian/changelog
--- check_mk-1.1.13i3.orig//debian/changelog 2012-04-16 09:12:14.000000000 +0100
+++ check_mk-1.1.13i3//debian/changelog 2012-04-16 09:12:44.000000000 +0100
@@ -1,3 +1,10 @@
+check-mk (1.1.13i3-1~bpo60+1.1) squeeze-backports; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream
+
+ -- Adrian Bridgett <[email protected]> Tue, 3 Apr 2012 17:56:35 +0000
+
check-mk (1.1.12-1~bpo60+1.1) squeeze-backports; urgency=low
* Non-maintainer upload.
diff -Naur check_mk-1.1.13i3.orig//debian/check-mk-config-icinga.install check_mk-1.1.13i3//debian/check-mk-config-icinga.install
--- check_mk-1.1.13i3.orig//debian/check-mk-config-icinga.install 2012-04-16 09:12:14.000000000 +0100
+++ check_mk-1.1.13i3//debian/check-mk-config-icinga.install 2012-04-16 09:12:44.000000000 +0100
@@ -1,2 +1,2 @@
-usr/share/doc/check_mk/check_mk_templates.cfg etc/icinga/objects/check_mk
+usr/share/check_mk/check_mk_templates.cfg etc/icinga/objects/check_mk
etc/check_mk/multisite.mk
diff -Naur check_mk-1.1.13i3.orig//debian/check-mk-config-nagios3.install check_mk-1.1.13i3//debian/check-mk-config-nagios3.install
--- check_mk-1.1.13i3.orig//debian/check-mk-config-nagios3.install 2012-04-16 09:12:14.000000000 +0100
+++ check_mk-1.1.13i3//debian/check-mk-config-nagios3.install 2012-04-16 09:12:44.000000000 +0100
@@ -1,2 +1,2 @@
-usr/share/doc/check_mk/check_mk_templates.cfg etc/nagios3/conf.d/check_mk
+usr/share/check_mk/check_mk_templates.cfg etc/nagios3/conf.d/check_mk
etc/check_mk/multisite.mk
diff -Naur check_mk-1.1.13i3.orig//debian/check-mk-server.install check_mk-1.1.13i3//debian/check-mk-server.install
--- check_mk-1.1.13i3.orig//debian/check-mk-server.install 2012-04-16 09:12:14.000000000 +0100
+++ check_mk-1.1.13i3//debian/check-mk-server.install 2012-04-16 09:12:44.000000000 +0100
@@ -9,5 +9,4 @@
usr/bin/check_mk
usr/share/check_mk/checks
usr/share/check_mk/modules
-usr/share/check_mk/pnp-rraconf
usr/share/check_mk/pnp-templates
diff -Naur check_mk-1.1.13i3.orig//debian/defaults.icinga check_mk-1.1.13i3//debian/defaults.icinga
--- check_mk-1.1.13i3.orig//debian/defaults.icinga 2012-04-16 09:12:14.000000000 +0100
+++ check_mk-1.1.13i3//debian/defaults.icinga 2012-04-16 09:12:44.000000000 +0100
@@ -7,11 +7,12 @@
# and enter new values when asked, or edit ~/.check_mk_setup.conf and
# run ./setup.sh --yes.
-check_mk_version = '1.1.12'
+check_mk_version = '1.1.13'
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'
-check_manpages_dir = '/usr/share/doc/check_mk/checks'
+check_manpages_dir = '/usr/share/doc/check-mk-doc/checks'
modules_dir = '/usr/share/check_mk/modules'
locale_dir = '/usr/share/check_mk/locale'
agents_dir = '/usr/share/check_mk/agents'
@@ -22,14 +23,14 @@
precompiled_hostchecks_dir = '/var/lib/check_mk/precompiled'
counters_directory = '/var/lib/check_mk/counters'
tcp_cache_dir = '/var/lib/check_mk/cache'
+tmp_dir = '/var/lib/check_mk/tmp'
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'
-nagios_url = '/icinga'
-nagios_cgi_url = '/cgi-bin/icinga'
logwatch_notes_url = '/check_mk/logwatch.py?host=%s&file=%s'
www_group = 'nagios'
nagios_config_file = '/etc/icinga/icinga.cfg'
@@ -39,12 +40,10 @@
htpasswd_file = '/etc/icinga/htpasswd.users'
nagios_auth_name = 'Nagios Access'
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-doc'
check_mk_automation = 'sudo -u nagios /usr/bin/check_mk --automation'
diff -Naur check_mk-1.1.13i3.orig//debian/defaults.nagios3 check_mk-1.1.13i3//debian/defaults.nagios3
--- check_mk-1.1.13i3.orig//debian/defaults.nagios3 2012-04-16 09:12:14.000000000 +0100
+++ check_mk-1.1.13i3//debian/defaults.nagios3 2012-04-16 09:12:44.000000000 +0100
@@ -7,11 +7,12 @@
# and enter new values when asked, or edit ~/.check_mk_setup.conf and
# run ./setup.sh --yes.
-check_mk_version = '1.1.12'
+check_mk_version = '1.1.13'
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'
-check_manpages_dir = '/usr/share/doc/check_mk/checks'
+check_manpages_dir = '/usr/share/doc/check-mk-doc/checks'
modules_dir = '/usr/share/check_mk/modules'
locale_dir = '/usr/share/check_mk/locale'
agents_dir = '/usr/share/check_mk/agents'
@@ -22,14 +23,14 @@
precompiled_hostchecks_dir = '/var/lib/check_mk/precompiled'
counters_directory = '/var/lib/check_mk/counters'
tcp_cache_dir = '/var/lib/check_mk/cache'
+tmp_dir = '/var/lib/check_mk/tmp'
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'
-nagios_url = '/nagios3'
-nagios_cgi_url = '/cgi-bin/nagios3'
logwatch_notes_url = '/check_mk/logwatch.py?host=%s&file=%s'
www_group = 'nagios'
nagios_config_file = '/etc/nagios3/nagios.cfg'
@@ -39,12 +40,10 @@
htpasswd_file = '/etc/nagios3/htpasswd.users'
nagios_auth_name = 'Nagios Access'
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-doc'
check_mk_automation = 'sudo -u nagios /usr/bin/check_mk --automation'
