diff --git a/debian/defaults.icinga b/debian/defaults.icinga
index dc87ae4f5ae5782be2419be960f54208b7128ccc..6f94458ad98ba66edc820f17d9a634d06f58bdba 100644 (file)
--- a/debian/defaults.icinga
+++ b/debian/defaults.icinga
-# This file has been created during setup
-# of check_mk at Sat Mar 20 10:05:23 CET 2010
+# This file has been created during setup of check_mk at Sun Oct 17 17:18:15 CEST 2010.
+# Do not edit this file. Also do not try to override these settings
+# in main.mk since some of them are hardcoded into several files
+# during setup.
#
-# Do not edit. If you want to use other
-# directories please configure them in
-# main.mk
-check_mk_version = '1.1.2'
+# If you need to change these settings, you have to re-run setup.sh
+# and enter new values when asked, or edit ~/.check_mk_setup.conf and
+# run ./setup.sh --yes.
+
+check_mk_version = '1.1.6p1'
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'
+agents_dir = '/usr/share/check_mk/agents'
var_dir = '/var/lib/check_mk'
lib_dir = '/usr/lib/check_mk'
autochecksdir = '/var/lib/check_mk/autochecks'
precompiled_hostchecks_dir = '/var/lib/check_mk/precompiled'
counters_directory = '/var/lib/check_mk/counters'
-tcp_cache_dir = '/var/lib/check_mk/cache'
+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_conf_dir = '/etc/icinga/objects'
nagios_user = 'nagios'
nagios_url = '/icinga'
-nagios_cgi_url = '/icinga/cgi-bin'
-logwatch_notes_url = '/icinga/logwatch.php?host=%s&file=%s'
-www_group = 'www-data'
+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'
nagios_startscript = '/etc/init.d/icinga'
nagios_binary = '/usr/sbin/icinga'
checkmk_web_uri = '/check_mk'
livestatus_unix_socket = '/var/lib/icinga/rw/live'
livebackendsdir = '/usr/share/check_mk/livestatus'
+pnp_url = '/pnp4nagios/'
+pnp_templates_dir = '/usr/share/check_mk/pnp-templates'
+doc_dir = '/usr/share/doc/check_mk'