[Pkg-nagios-changes] [pkg-check-mk] 01/01: update debian/defaults.* based on new upstream
Matt Taggart
taggart at moszumanska.debian.org
Fri Jun 5 23:28:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
taggart pushed a commit to branch master
in repository pkg-check-mk.
commit b4db1dd34f8d402c82f7eb308d14848c62d805d6
Author: Matt Taggart <taggart at debian.org>
Date: Fri Jun 5 16:28:26 2015 -0700
update debian/defaults.* based on new upstream
---
debian/changelog | 3 ++-
debian/defaults.icinga | 26 ++++++++++++--------------
debian/defaults.nagios3 | 26 ++++++++++++--------------
3 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4aa563b..80dbb21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,11 +18,12 @@ check-mk (1.2.6p4-1) UNRELEASED; urgency=medium
* Confirmed that CVE-2014-2329, CVE-2014-2330, CVE-2014-2331,
CVE-2014-2332 are fixed in upstream as of 1.2.3i5 (Closes: #742689).
* New upstream release (Closes: #778380).
- * debian/defaults.*: Use correct check-mk version.
* upstream forgot to include waitmax.c in their "source" tarball,
provide it in the source package for now
* logwatch.cfg example changed location upstream, adjust
check_mk_agent_logwatch.{example,install}
+ * regenerate defaults.* starting with upstream versions generated by
+ setup.sh and then porting forward the debian specific changes.
-- Matt Taggart <taggart at debian.org> Wed, 20 May 2015 15:09:13 -0700
diff --git a/debian/defaults.icinga b/debian/defaults.icinga
index 2e3380b..e85524f 100644
--- a/debian/defaults.icinga
+++ b/debian/defaults.icinga
@@ -1,7 +1,7 @@
-# This file has been created during setup of check_mk at Sun Oct 17 17:18:15 CEST 2010.
+# This file has been created during setup of check_mk at Thu Jun 4 17:56:01 PDT 2015.
# 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.
+# during setup.
#
# 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
@@ -10,30 +10,32 @@
check_mk_version = '1.2.6p4'
default_config_dir = '/etc/check_mk'
check_mk_configdir = '/etc/check_mk/conf.d'
-share_dir = '/usr/share/check_mk'
+share_dir = '/usr/share/check_mk'
checks_dir = '/usr/share/check_mk/checks'
-notifications_dir = '/usr/share/check_mk/notifications'
+notifications_dir = '/usr/share/check_mk/notifications'
+inventory_dir = '/usr/share/check_mk/inventory'
check_manpages_dir = '/usr/share/check_mk/checks-man'
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'
+var_dir = '/var/lib/check_mk'
+log_dir = '/var/lib/check_mk/log'
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'
-tcp_cache_dir = '/var/lib/check_mk/cache'
-tmp_dir = '/var/lib/check_mk'
+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'
+rrd_path = '/var/lib/nagios/rrd'
+rrddcached_socket = '/tmp/rrdcached.sock'
nagios_command_pipe_path = '/var/lib/icinga/rw/icinga.cmd'
-check_result_path = '/var/lib/icinga/spool/checkresults'
+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'
@@ -43,14 +45,10 @@ apache_config_dir = '/etc/apache2/conf.d'
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'
-rrd_path = '/var/lib/nagios/rrd'
-log_dir = '/var/log/check_mk'
diff --git a/debian/defaults.nagios3 b/debian/defaults.nagios3
index 309d6da..62fcb66 100644
--- a/debian/defaults.nagios3
+++ b/debian/defaults.nagios3
@@ -1,7 +1,7 @@
-# This file has been created during setup of check_mk at Sun Oct 17 17:18:15 CEST 2010.
+# This file has been created during setup of check_mk at Thu Jun 4 17:56:01 PDT 2015.
# 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.
+# during setup.
#
# 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
@@ -10,30 +10,32 @@
check_mk_version = '1.2.6p4'
default_config_dir = '/etc/check_mk'
check_mk_configdir = '/etc/check_mk/conf.d'
-share_dir = '/usr/share/check_mk'
+share_dir = '/usr/share/check_mk'
checks_dir = '/usr/share/check_mk/checks'
-notifications_dir = '/usr/share/check_mk/notifications'
+notifications_dir = '/usr/share/check_mk/notifications'
+inventory_dir = '/usr/share/check_mk/inventory'
check_manpages_dir = '/usr/share/check_mk/checks-man'
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'
+var_dir = '/var/lib/check_mk'
+log_dir = '/var/lib/check_mk/log'
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'
-tcp_cache_dir = '/var/lib/check_mk/cache'
-tmp_dir = '/var/lib/check_mk'
+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'
+rrd_path = '/var/lib/nagios/rrd'
+rrddcached_socket = '/tmp/rrdcached.sock'
nagios_command_pipe_path = '/var/lib/nagios3/rw/nagios.cmd'
-check_result_path = '/var/lib/nagios3/spool/checkresults'
+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'
@@ -43,14 +45,10 @@ apache_config_dir = '/etc/apache2/conf.d'
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'
-rrd_path = '/var/lib/nagios/rrd'
-log_dir = '/var/log/check_mk'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-check-mk.git
More information about the Pkg-nagios-changes
mailing list