[prev in list] [next in list] [prev in thread] [next in thread] 

List:       omd-commits
Subject:    [omd-commits] OMD Git: omd: check_mk: make upstream sets version
From:       git () mathias-kettner ! de (git version control)
Date:       2010-10-25 18:20:15
Message-ID: 20101025182015.DD1FCC028EA () mail ! mathias-kettner ! de
[Download RAW message or body]

Module: omd
Branch: master
Commit: 865a9da6053230caf786bf4ecb4139a51db47cad
URL:    http://omdistro.org/projects/omd/repository/revisions/865a9da6053230caf786bf4ecb4139a51db47cad

Author: Mathias Kettner <mk at mathias-kettner.de>
Date:   Mon Oct 25 11:48:51 2010 +0200

check_mk: make upstream sets version

---

 packages/check_mk/Makefile                   |    3 +++
 packages/check_mk/skel/etc/check_mk/defaults |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index c3b9706..d9f7477 100644
--- a/packages/check_mk/Makefile
+++ b/packages/check_mk/Makefile
@@ -83,3 +83,6 @@ upstream:
           sed -e 's/nagiosadmin/omdadmin/g' \
               -e 's@^nagvis_base_url.*@nagvis_base_url = "/###SITE###/nagvis"@' \
                > skel/etc/check_mk/multisite.mk
+
+	# Add correct version number
+	sed -i "s/^check_mk_version.*/check_mk_version            = '$(VERSION)'/" skel/etc/check_mk/defaults
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index 4cad3cc..ebe8021 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.1.8b2'
+check_mk_version            = '1.1.8'
 default_config_dir          = '###ROOT###/etc/check_mk'
 check_mk_configdir          = '###ROOT###/etc/check_mk/conf.d'
 checks_dir                  = '###ROOT###/share/check_mk/checks'


[prev in list] [next in list] [prev in thread] [next in thread]