[omd-commits] OMD Git: omd: Check_MK: New version 1.2.0p2

[git version control]

Module:   omd
Branch:   master
Commit:   83df8ba8c24aa6b919b6e9d4b15038a24b312699
URL:      http://omdistro.org/projects/omd/repository/revisions/83df8ba8c24aa6b919b6e9d4b15038a24b312699

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Jul  4 11:26:17 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Jul  4 11:26:17 2012 +0200

Check_MK: New version 1.2.0p2

---

 Changelog                                          |    2 +-
 packages/check_mk/Makefile                         |    2 +-
 ...k_mk-1.2.0p1.tar.gz => check_mk-1.2.0p2.tar.gz} |  Bin 11604623 -> 11643327 bytes
 packages/check_mk/skel/etc/check_mk/defaults       |    2 +-
 packages/check_mk/skel/etc/check_mk/multisite.mk   |    2 +-
 .../skel/etc/nagios/conf.d/check_mk_templates.cfg  |    1 +
 packages/mk-livestatus/Makefile                    |    2 +-
 .../mk-livestatus/mk-livestatus-1.2.0p1.tar.gz     |  Bin 371663 -> 0 bytes
 .../mk-livestatus/mk-livestatus-1.2.0p2.tar.gz     |  Bin 0 -> 371580 bytes
 9 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Changelog b/Changelog
index 142a5e8..dd9e616 100644
--- a/Changelog
+++ b/Changelog
@@ -13,7 +13,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Nagios Plugins: Update to 1.4.16
           - PNP4Nagios: Update to 0.6.18
           - Icinga: Update to 1.7.1
-          - Check_MK: Added 1.2.0p1 release
+          - Check_MK: Added 1.2.0p2 release
           - Support Ubuntu 12.04 (Precise)
 
 0.54     Apr 02 2012
diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index 27caa4a..5550259 100644
--- a/packages/check_mk/Makefile
+++ b/packages/check_mk/Makefile
@@ -2,7 +2,7 @@ include ../../Makefile.omd
 
 SHELL = /bin/bash
 NAME = check_mk
-VERSION = 1.2.0p1
+VERSION = 1.2.0p2
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_mk/check_mk-1.2.0p1.tar.gz b/packages/check_mk/check_mk-1.2.0p2.tar.gz
similarity index 70%
rename from packages/check_mk/check_mk-1.2.0p1.tar.gz
rename to packages/check_mk/check_mk-1.2.0p2.tar.gz
index 3a46300..5e9114b 100644
Binary files a/packages/check_mk/check_mk-1.2.0p1.tar.gz and b/packages/check_mk/check_mk-1.2.0p2.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index d71faf0..425ec2a 100644
--- a/packages/check_mk/skel/etc/check_mk/defaults
+++ b/packages/check_mk/skel/etc/check_mk/defaults
@@ -3,7 +3,7 @@
 # Do not edit this file. It is handled by OMD. Changing something
 # here will break something almost for sure. You have been warned.
 
-check_mk_version            = '1.2.0p1'
+check_mk_version            = '1.2.0p2'
 default_config_dir          = '###ROOT###/etc/check_mk'
 check_mk_configdir          = '###ROOT###/etc/check_mk/conf.d'
 share_dir                   = '###ROOT###/share/check_mk'
diff --git a/packages/check_mk/skel/etc/check_mk/multisite.mk b/packages/check_mk/skel/etc/check_mk/multisite.mk
index 91a6d6c..0c0d4c2 100644
--- a/packages/check_mk/skel/etc/check_mk/multisite.mk
+++ b/packages/check_mk/skel/etc/check_mk/multisite.mk
@@ -69,7 +69,7 @@ custom_links['admin'] = custom_links['user'] + [
       ( "Mathias Kettner",                "http://mathias-kettner.de/" ),
       ( "Check_MK Mailinglists",          "http://mathias-kettner.de/check_mk_lists.html" ),
       ( "Check_MK Exchange (inofficial)", "http://exchange.check-mk.org/", None, "_blank" ),
-      ( "Nagios Portal (German)",         "http://nagios-portal.org", None, "_blank"),
+      ( "Monitoring Portal (German)",     "http://monitoring-portal.org", None, "_blank"),
   ])
 ]
 
diff --git a/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg b/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg
index ff6cd98..33d8d07 100644
--- a/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg
+++ b/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg
@@ -309,6 +309,7 @@ define command {
   command_line \
        NOTIFY_CONTACTNAME='$CONTACTNAME$' \
        NOTIFY_CONTACTEMAIL='$CONTACTEMAIL$' \
+       NOTIFY_CONTACTPAGER='$CONTACTPAGER$' \
        NOTIFY_NOTIFICATIONTYPE='$NOTIFICATIONTYPE$' \
        NOTIFY_HOSTNAME='$HOSTNAME$' \
        NOTIFY_HOSTALIAS='$HOSTALIAS$' \
diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile
index 6d0f837..970c822 100644
--- a/packages/mk-livestatus/Makefile
+++ b/packages/mk-livestatus/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = mk-livestatus
-VERSION = 1.2.0p1
+VERSION = 1.2.0p2
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0p1.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0p1.tar.gz
deleted file mode 100644
index 874307d..0000000
Binary files a/packages/mk-livestatus/mk-livestatus-1.2.0p1.tar.gz and /dev/null differ
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0p2.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0p2.tar.gz
new file mode 100644
index 0000000..d89f6d8
Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.0p2.tar.gz differ