averi pushed to check-mk (el6). "Update the defaults and defaults.py files including new variables"

[notifications at fedoraproject.org]

>From c578388170b480fce452b448902a7729418bea33 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 12:33:01 +0200
Subject: Update the defaults and defaults.py files including new variables


diff --git a/defaults b/defaults
index 01b38c8..0bc4f25 100644
--- a/defaults
+++ b/defaults
@@ -1,18 +1,10 @@
-# This file has been created during setup of check_mk at Tue Apr  9 17:15:45 CEST 2013.
-# 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.
-#
-# 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.2.4p2'
+check_mk_version            = '1.2.6'
 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'
 notifications_dir           = '/usr/share/check_mk/notifications'
+inventory_dir               = '/usr/share/check_mk/inventory'
 check_manpages_dir          = '/usr/share/doc/check_mk/checks'
 modules_dir                 = '/usr/share/check_mk/modules'
 locale_dir                  = '/usr/share/check_mk/locale'
diff --git a/defaults.py b/defaults.py
index 01b38c8..0bc4f25 100644
--- a/defaults.py
+++ b/defaults.py
@@ -1,18 +1,10 @@
-# This file has been created during setup of check_mk at Tue Apr  9 17:15:45 CEST 2013.
-# 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.
-#
-# 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.2.4p2'
+check_mk_version            = '1.2.6'
 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'
 notifications_dir           = '/usr/share/check_mk/notifications'
+inventory_dir               = '/usr/share/check_mk/inventory'
 check_manpages_dir          = '/usr/share/doc/check_mk/checks'
 modules_dir                 = '/usr/share/check_mk/modules'
 locale_dir                  = '/usr/share/check_mk/locale'
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=el6&id=c578388170b480fce452b448902a7729418bea33