From git at mathias-kettner.de  Wed May  2 09:54:19 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 02 May 2012 09:54:19 +0200
Subject: [omd-commits] OMD Git: omd: Fixed syntax errors in CentOS 6.1
	distro file
Message-ID: <20120502075420.06BE484243E@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 09:54:01 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 09:54:01 2012 +0200

Fixed syntax errors in CentOS 6.1 distro file

---

 distros/Makefile.CENTOS_6.2 |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/distros/Makefile.CENTOS_6.2 b/distros/Makefile.CENTOS_6.2
index ccf3129..3a8c21e 100644
--- a/distros/Makefile.CENTOS_6.2
+++ b/distros/Makefile.CENTOS_6.2
@@ -39,11 +39,9 @@ OS_PACKAGES      += boost-program-options
 OS_PACKAGES      += curl
 OS_PACKAGES      += dialog
 OS_PACKAGES      += expat
-OS_PACKAGES      += fping                 # LM: Could not find it in std sources.
-                                          # Found the pkg in http://pkgs.repoforge.org/fping/
+OS_PACKAGES      += fping                 # LM: Could not find it in std sources. (Found the pkg in http://pkgs.repoforge.org/fping/)
 OS_PACKAGES      += graphviz
-OS_PACKAGES      += graphviz-gd           # LM: Got it from http://mirror.centos.org/centos/6/os/x86_64/Packages/
-                                          # Maybe also available on DVD2
+OS_PACKAGES      += graphviz-gd           # LM: Got it from http://mirror.centos.org/centos/6/os/x86_64/Packages/ - Maybe also available on DVD2
 OS_PACKAGES      += httpd
 OS_PACKAGES      += libevent
 OS_PACKAGES      += libmcrypt             # LM: Taken from http://pkgs.repoforge.org/libmcrypt/


From git at mathias-kettner.de  Wed May  2 09:54:19 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 02 May 2012 09:54:19 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20120502075420.1729D841236@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   4812ece7b01d8a18572fc3289716a6e982ea74e7
URL:      http://omdistro.org/projects/omd/repository/revisions/4812ece7b01d8a18572fc3289716a6e982ea74e7

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 09:54:18 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 09:54:18 2012 +0200

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Wed May  2 16:28:52 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 02 May 2012 16:28:52 +0200
Subject: [omd-commits] OMD Git: omd: shinken: Updated gitignore
Message-ID: <20120502142852.8DB50842441@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 16:27:08 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 16:27:08 2012 +0200

shinken: Updated gitignore

---

 packages/shinken/.gitignore |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/packages/shinken/.gitignore b/packages/shinken/.gitignore
index c981633..96890bb 100644
--- a/packages/shinken/.gitignore
+++ b/packages/shinken/.gitignore
@@ -3,5 +3,7 @@ multiprocessing-2.6.2.1
 setuptools-0.6c11
 simplejson-2.1.2
 ctypes-1.0.2
+mongodb-linux-x86_64-static-legacy-[0-9].[0-9].[0-9]
+pymongo-[0-9].[0-9].[0-9]
 shinken-[0-9].[0-9].[0-9]
 shinken-[0-9].[0-9]


From git at mathias-kettner.de  Wed May  2 16:28:52 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 02 May 2012 16:28:52 +0200
Subject: [omd-commits] OMD Git: omd: Check_MK: Added new version 1.2.0b3
Message-ID: <20120502142852.A516A84243E@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   1cf263624eced4b020fb19c7e1f9ded2f07b0a2a
URL:      http://omdistro.org/projects/omd/repository/revisions/1cf263624eced4b020fb19c7e1f9ded2f07b0a2a

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 16:00:10 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 16:00:10 2012 +0200

Check_MK: Added new version 1.2.0b3

---

 Changelog                                          |    1 +
 packages/check_mk/Makefile                         |   36 ++-
 packages/check_mk/check_mk-1.1.12p7.tar.gz         |  Bin 2784061 -> 0 bytes
 packages/check_mk/check_mk-1.2.0b3.tar.gz          |  Bin 0 -> 11345820 bytes
 packages/check_mk/skel.permissions                 |    8 +
 packages/check_mk/skel/etc/check_mk/defaults       |    2 +-
 packages/check_mk/skel/etc/check_mk/multisite.mk   |  106 ++------
 .../skel/etc/nagios/conf.d/check_mk_templates.cfg  |  314 --------------------
 8 files changed, 54 insertions(+), 413 deletions(-)

Diff:   http://omdistro.org/projects/omd/repository/diff/?rev=1cf263624eced4b020fb19c7e1f9ded2f07b0a2a

From git at mathias-kettner.de  Wed May  2 16:28:52 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 02 May 2012 16:28:52 +0200
Subject: [omd-commits] OMD Git: omd: check_mk: Fixed template file
Message-ID: <20120502142852.AFB8F841236@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 16:21:14 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed May  2 16:21:14 2012 +0200

check_mk: Fixed template file

---

 .../skel/etc/nagios/conf.d/check_mk_templates.cfg  |  353 ++++++++++++++++++++
 1 files changed, 353 insertions(+), 0 deletions(-)

Diff:   http://omdistro.org/projects/omd/repository/diff/?rev=c61a8ad809753e42fe300c87cb592bfcc0bd1894

From git at mathias-kettner.de  Thu May  3 14:49:08 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 03 May 2012 14:49:08 +0200
Subject: [omd-commits] OMD Git: omd: mod-gearman: update 1.3.0
Message-ID: <20120503124908.3934B842413@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Thu May  3 14:48:46 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Thu May  3 14:48:46 2012 +0200

mod-gearman: update 1.3.0

---

 Changelog                                     |    2 +-
 packages/mod-gearman/Makefile                 |    2 +-
 packages/mod-gearman/mod_gearman-1.2.8.tar.gz |  Bin 303680 -> 0 bytes
 packages/mod-gearman/mod_gearman-1.3.0.tar.gz |  Bin 0 -> 303777 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index f82a85c..14f0337 100644
--- a/Changelog
+++ b/Changelog
@@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution
               whole tmp/ directory but only the contents
           - RPMS: Not checking for removed version during pkg release update
                  (Does not mean omd version update.)
-          - Mod-Gearman: Updated to version 1.2.8
+          - Mod-Gearman: Updated to version 1.3.0
           - Thruk: Update to 1.28
           - Check_MK: Added 1.2.0b3 release
 
diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index 4e6f1d3..50042ce 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = mod_gearman
-VERSION  = 1.2.8
+VERSION  = 1.3.0
 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }')
 DIR      = mod_gearman-$(VERSION)
 
diff --git a/packages/mod-gearman/mod_gearman-1.2.8.tar.gz b/packages/mod-gearman/mod_gearman-1.2.8.tar.gz
deleted file mode 100644
index b62c40e..0000000
Binary files a/packages/mod-gearman/mod_gearman-1.2.8.tar.gz and /dev/null differ
diff --git a/packages/mod-gearman/mod_gearman-1.3.0.tar.gz b/packages/mod-gearman/mod_gearman-1.3.0.tar.gz
new file mode 100644
index 0000000..b1d0626
Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.3.0.tar.gz differ


From git at mathias-kettner.de  Mon May  7 10:17:03 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 07 May 2012 10:17:03 +0200
Subject: [omd-commits] OMD Git: omd: pnp4nagios: added empty config.d
	directory (
Message-ID: <20120507081703.A9F5584244E@mail.mathias-kettner.de>

 needed by multisite login dialog based auth)
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Module:   omd
Branch:   master
Commit:   98555487c3b57a53ecdacdbc6b1a4dd63ede8de2
URL:      http://omdistro.org/projects/omd/repository/revisions/98555487c3b57a53ecdacdbc6b1a4dd63ede8de2

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 09:49:45 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 09:49:45 2012 +0200

pnp4nagios: added empty config.d directory (needed by multisite login dialog based auth)

---

 0 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/config.d/.gitignore b/packages/pnp4nagios/skel/etc/pnp4nagios/config.d/.gitignore
new file mode 100644
index 0000000..e69de29


From git at mathias-kettner.de  Mon May  7 10:17:03 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 07 May 2012 10:17:03 +0200
Subject: [omd-commits] OMD Git: omd: Check_MK: Added missing
	MULTISITE_COOKIE_AUTH hook
Message-ID: <20120507081703.C391784242A@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 09:32:04 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 09:32:04 2012 +0200

Check_MK: Added missing MULTISITE_COOKIE_AUTH hook

---

 packages/check_mk/MULTISITE_COOKIE_AUTH.hook |   43 ++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
new file mode 100755
index 0000000..bc16f43
--- /dev/null
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Alias: Use multisite cookie auth
+# Menu: Web GUI
+# Description: 
+#  Multisite provides a cookie based authentication which can be
+#  used as alternative to the default basic authentication.
+#  The cookie authentication is done by multisite. The cookie can
+#  also be used by other addons like NagVis. This is switched
+#  using this option.
+
+case "$1" in
+   default)
+       echo "on"
+   ;;
+   choices)
+       echo "on: use cookie authentication"
+       echo "off: use basic authentication"
+   ;;
+   set)
+       APACHE_CFG=${OMD_ROOT}/etc/apache/conf.d/cookie_auth.conf
+       NAGVIS_CFG=${OMD_ROOT}/etc/nagvis/conf.d/cookie_auth.ini.php
+       if [ "$2" == "on" ]; then
+           cat > $APACHE_CFG <<EOF
+<LocationMatch ^/${OMD_SITE}/(omd|nagvis|check_mk|pnp4nagios)>
+    Order allow,deny
+    Allow from all
+    Satisfy any
+</LocationMatch>
+EOF
+
+          cat > $NAGVIS_CFG <<EOF
+[global]
+logonmodule="LogonMultisite"
+logon_multisite_secret="/omd/sites/$OMD_SITE/etc/auth.secret"
+logon_multisite_htpasswd="/omd/sites/$OMD_SITE/etc/htpasswd"
+EOF
+       else
+          [ -f $APACHE_CFG ] && rm $APACHE_CFG
+          [ -f $NAGVIS_CFG ] && rm $NAGVIS_CFG
+       fi
+   ;;
+esac


From git at mathias-kettner.de  Mon May  7 10:17:03 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 07 May 2012 10:17:03 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20120507081703.D7647842416@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   5ec138f72a54059fa7a34c916f8aaabddd099b6f
URL:      http://omdistro.org/projects/omd/repository/revisions/5ec138f72a54059fa7a34c916f8aaabddd099b6f

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 10:17:02 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 10:17:02 2012 +0200

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Mon May  7 10:17:03 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 07 May 2012 10:17:03 +0200
Subject: [omd-commits] OMD Git: omd: Check_MK: Added pnp config file to
 login dialog hook
Message-ID: <20120507081703.E413C84244D@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 10:05:01 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 10:05:01 2012 +0200

Check_MK: Added pnp config file to login dialog hook

---

 packages/check_mk/MULTISITE_COOKIE_AUTH.hook |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
index efe25e3..da14647 100755
--- a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -20,6 +20,7 @@ case "$1" in
    set)
        APACHE_CFG=${OMD_ROOT}/etc/apache/conf.d/cookie_auth.conf
        NAGVIS_CFG=${OMD_ROOT}/etc/nagvis/conf.d/cookie_auth.ini.php
+       PNP_CFG=${OMD_ROOT}/etc/pnp4nagios/config.d/cookie_auth.php
        if [ "$2" == "on" ]; then
            cat > $APACHE_CFG <<EOF
 <LocationMatch ^/${OMD_SITE}/(omd|nagvis|check_mk|pnp4nagios)>
@@ -35,9 +36,23 @@ logonmodule="LogonMultisite"
 logon_multisite_secret="/omd/sites/$OMD_SITE/etc/auth.secret"
 logon_multisite_htpasswd="/omd/sites/$OMD_SITE/etc/htpasswd"
 EOF
+
+          cat > $PNP_CFG <<EOF
+<?php
+// Created by OMD hook MULTISITE_COOKIE_AUTH
+//
+// Using the multisite cookie based authentication when no
+// REMOTE_USER available.
+//
+\$conf['auth_multisite_enabled']  = TRUE;
+\$conf['auth_multisite_htpasswd'] = '/omd/sites/$OMD_SITE/etc/htpasswd';
+\$conf['auth_multisite_secret']   = '/omd/sites/$OMD_SITE/etc/auth.secret';
+?>
+EOF
        else
           [ -f $APACHE_CFG ] && rm $APACHE_CFG
           [ -f $NAGVIS_CFG ] && rm $NAGVIS_CFG
+          [ -f $PNP_CFG ] && rm $PNP_CFG
        fi
    ;;
 esac


From git at mathias-kettner.de  Mon May  7 10:17:03 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 07 May 2012 10:17:03 +0200
Subject: [omd-commits] OMD Git: omd: Check_MK: Login dialog disabled by
 default in regular OMD
Message-ID: <20120507081704.0654A84242F@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   9e55a09e4de3632591bf1b1ebe3e117a71453917
URL:      http://omdistro.org/projects/omd/repository/revisions/9e55a09e4de3632591bf1b1ebe3e117a71453917

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 09:38:34 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Mon May  7 09:38:34 2012 +0200

Check_MK: Login dialog disabled by default in regular OMD

---

 packages/check_mk/MULTISITE_COOKIE_AUTH.hook |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
index bc16f43..efe25e3 100755
--- a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -11,7 +11,7 @@
 
 case "$1" in
    default)
-       echo "on"
+       echo "off"
    ;;
    choices)
        echo "on: use cookie authentication"


From git at mathias-kettner.de  Tue May  8 11:00:49 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 08 May 2012 11:00:49 +0200
Subject: [omd-commits] OMD Git: omd: omd: Added disto file for ubuntu 12.04
 (untested yet)
Message-ID: <20120508090049.BE55884242A@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 11:00:45 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 11:00:45 2012 +0200

omd: Added disto file for ubuntu 12.04 (untested yet)

---

 distros/Makefile.UBUNTU_12.04 |   81 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 0 deletions(-)

diff --git a/distros/Makefile.UBUNTU_12.04 b/distros/Makefile.UBUNTU_12.04
new file mode 100644
index 0000000..6d9ab8a
--- /dev/null
+++ b/distros/Makefile.UBUNTU_12.04
@@ -0,0 +1,81 @@
+DISTRO_CODE     = precise
+BUILD_PACKAGES  =
+BUILD_PACKAGES += build-essential
+BUILD_PACKAGES += dpatch
+BUILD_PACKAGES += fping
+BUILD_PACKAGES += git-buildpackage
+BUILD_PACKAGES += libboost-all-dev
+BUILD_PACKAGES += libcloog-ppl0
+BUILD_PACKAGES += libcairo2-dev
+BUILD_PACKAGES += libevent-dev
+BUILD_PACKAGES += libgd2-xpm-dev
+BUILD_PACKAGES += libglib2.0-dev
+BUILD_PACKAGES += libgnutls-dev
+BUILD_PACKAGES += libldap2-dev
+BUILD_PACKAGES += libltdl-dev
+BUILD_PACKAGES += libmcrypt-dev
+BUILD_PACKAGES += libmysqlclient15-dev
+BUILD_PACKAGES += libpango1.0-dev
+BUILD_PACKAGES += libperl-dev
+BUILD_PACKAGES += libreadline-dev
+BUILD_PACKAGES += libssl-dev
+BUILD_PACKAGES += libxml2-dev
+BUILD_PACKAGES += patch
+BUILD_PACKAGES += python-dev
+BUILD_PACKAGES += python-setuptools
+BUILD_PACKAGES += uuid-dev
+BUILD_PACKAGES += snmp
+BUILD_PACKAGES += apache2-dev  # compiling mod_python
+BUILD_PACKAGES += apache2      # compiling mod_python
+OS_PACKAGES     =
+OS_PACKAGES    += curl
+OS_PACKAGES    += dialog
+OS_PACKAGES    += dnsutils
+OS_PACKAGES    += fping
+OS_PACKAGES    += graphviz
+OS_PACKAGES    += libapache2-mod-fcgid
+OS_PACKAGES    += libapache2-mod-proxy-html
+OS_PACKAGES    += libboost-program-options1.42.0
+OS_PACKAGES    += libdbi1
+OS_PACKAGES    += libevent-1.4-2
+OS_PACKAGES    += libgd2-xpm
+OS_PACKAGES    += libltdl7
+OS_PACKAGES    += libnet-snmp-perl
+OS_PACKAGES    += libpango1.0-0
+OS_PACKAGES    += libperl5.12
+OS_PACKAGES    += libreadline5
+OS_PACKAGES    += libsnmp-perl
+OS_PACKAGES    += libuuid1
+OS_PACKAGES    += mysql-server
+OS_PACKAGES    += patch
+OS_PACKAGES    += php5
+OS_PACKAGES    += php5-cli
+OS_PACKAGES    += php5-cgi
+OS_PACKAGES    += php5-gd
+OS_PACKAGES    += php5-mcrypt
+OS_PACKAGES    += php5-sqlite
+OS_PACKAGES    += php-pear
+OS_PACKAGES    += pyro
+OS_PACKAGES    += rsync
+OS_PACKAGES    += smbclient
+OS_PACKAGES    += snmp
+OS_PACKAGES    += unzip
+OS_PACKAGES    += xinetd
+USERADD_OPTIONS   = 
+ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
+PACKAGE_INSTALL   = aptitude -y update ; aptitude -y install
+ACTIVATE_INITSCRIPT = update-rc.d %s defaults
+APACHE_CONF_DIR   = /etc/apache2/conf.d
+APACHE_INIT       = /etc/init.d/apache2
+APACHE_USER       = www-data
+APACHE_GROUP      = www-data
+APACHE_BIN        = /usr/sbin/apache2
+APACHE_CTL        = /usr/sbin/apache2ctl
+APACHE_MODULE_DIR = /usr/lib/apache2/modules
+APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules
+APACHE_FCGID_MODULE = mod_fcgid.so
+APACHE_ENMOD      = a2enmod %s
+PHP_FCGI_BIN      = /usr/bin/php5-cgi
+BECOME_ROOT       = sudo su -c
+ARCH              = $(shell dpkg --print-architecture)
+MOUNT_OPTIONS     =


From git at mathias-kettner.de  Tue May  8 12:06:23 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 08 May 2012 12:06:23 +0200
Subject: [omd-commits] OMD Git: omd: Ubuntu 12.04: Added missing build
 dependency libncurses5-dev for mod-gearman
Message-ID: <20120508100623.B138D84242A@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   5ec6d96bbc3f23c1bea5bab50453fcbcaed453f7
URL:      http://omdistro.org/projects/omd/repository/revisions/5ec6d96bbc3f23c1bea5bab50453fcbcaed453f7

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 12:06:19 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 12:06:19 2012 +0200

Ubuntu 12.04: Added missing build dependency libncurses5-dev for mod-gearman

---

 distros/Makefile.UBUNTU_12.04 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/distros/Makefile.UBUNTU_12.04 b/distros/Makefile.UBUNTU_12.04
index 6d9ab8a..dc8cc0f 100644
--- a/distros/Makefile.UBUNTU_12.04
+++ b/distros/Makefile.UBUNTU_12.04
@@ -27,6 +27,7 @@ BUILD_PACKAGES += uuid-dev
 BUILD_PACKAGES += snmp
 BUILD_PACKAGES += apache2-dev  # compiling mod_python
 BUILD_PACKAGES += apache2      # compiling mod_python
+BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman
 OS_PACKAGES     =
 OS_PACKAGES    += curl
 OS_PACKAGES    += dialog


From git at mathias-kettner.de  Tue May  8 12:15:18 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 08 May 2012 12:15:18 +0200
Subject: [omd-commits] OMD Git: omd: Updated changelog
Message-ID: <20120508101518.2A20784242A@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 12:15:13 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 12:15:13 2012 +0200

Updated changelog

---

 Changelog |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Changelog b/Changelog
index 14f0337..85dcab6 100644
--- a/Changelog
+++ b/Changelog
@@ -9,6 +9,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Mod-Gearman: Updated to version 1.3.0
           - Thruk: Update to 1.28
           - Check_MK: Added 1.2.0b3 release
+          - Support Ubuntu 12.04 (Precise)
 
 0.54     Apr 02 2012
           - omd:


From git at mathias-kettner.de  Tue May  8 12:48:30 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 08 May 2012 12:48:30 +0200
Subject: [omd-commits] OMD Git: omd: Ubuntu 12.04: Fixed wrong perl
	dependency
Message-ID: <20120508104830.C50E284242A@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   44a05426aaeb4d2490624994226582094be99598
URL:      http://omdistro.org/projects/omd/repository/revisions/44a05426aaeb4d2490624994226582094be99598

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 12:48:27 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 12:48:27 2012 +0200

Ubuntu 12.04: Fixed wrong perl dependency

---

 distros/Makefile.UBUNTU_12.04 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/distros/Makefile.UBUNTU_12.04 b/distros/Makefile.UBUNTU_12.04
index dc8cc0f..878d18d 100644
--- a/distros/Makefile.UBUNTU_12.04
+++ b/distros/Makefile.UBUNTU_12.04
@@ -43,7 +43,7 @@ OS_PACKAGES    += libgd2-xpm
 OS_PACKAGES    += libltdl7
 OS_PACKAGES    += libnet-snmp-perl
 OS_PACKAGES    += libpango1.0-0
-OS_PACKAGES    += libperl5.12
+OS_PACKAGES    += libperl5.14
 OS_PACKAGES    += libreadline5
 OS_PACKAGES    += libsnmp-perl
 OS_PACKAGES    += libuuid1


From git at mathias-kettner.de  Tue May  8 14:33:17 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 08 May 2012 14:33:17 +0200
Subject: [omd-commits] OMD Git: omd: Ubuntu 12.04: fixed libboost package
	version
Message-ID: <20120508123317.9883484242A@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   7835ef0b4f79befeb3811a730f4bc6d599573092
URL:      http://omdistro.org/projects/omd/repository/revisions/7835ef0b4f79befeb3811a730f4bc6d599573092

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 14:33:13 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue May  8 14:33:13 2012 +0200

Ubuntu 12.04: fixed libboost package version

---

 distros/Makefile.UBUNTU_12.04 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/distros/Makefile.UBUNTU_12.04 b/distros/Makefile.UBUNTU_12.04
index 878d18d..a3e6e3e 100644
--- a/distros/Makefile.UBUNTU_12.04
+++ b/distros/Makefile.UBUNTU_12.04
@@ -36,7 +36,7 @@ OS_PACKAGES    += fping
 OS_PACKAGES    += graphviz
 OS_PACKAGES    += libapache2-mod-fcgid
 OS_PACKAGES    += libapache2-mod-proxy-html
-OS_PACKAGES    += libboost-program-options1.42.0
+OS_PACKAGES    += libboost-program-options1.46.1
 OS_PACKAGES    += libdbi1
 OS_PACKAGES    += libevent-1.4-2
 OS_PACKAGES    += libgd2-xpm


From git at mathias-kettner.de  Wed May 16 13:27:52 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 16 May 2012 13:27:52 +0200
Subject: [omd-commits] OMD Git: omd: Icinga: Update to 1.7.0
Message-ID: <20120516112752.843F68406E4@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   06f644712446c2c81e5e9cc0965dcacadaf129f6
URL:      http://omdistro.org/projects/omd/repository/revisions/06f644712446c2c81e5e9cc0965dcacadaf129f6

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Wed May 16 13:27:41 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Wed May 16 13:27:41 2012 +0200

Icinga: Update to 1.7.0

---

 Changelog                                          |    1 +
 packages/icinga/.gitignore                         |    2 +-
 packages/icinga/Makefile                           |    2 +-
 .../{icinga-1.6.1.tar.gz => icinga-1.7.0.tar.gz}   |  Bin 12880538 -> 12939198 bytes
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 85dcab6..b4f3613 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ This file documents the revision history for the Open Monitoring Distribution
                  (Does not mean omd version update.)
           - Mod-Gearman: Updated to version 1.3.0
           - Thruk: Update to 1.28
+          - Icinga: Update to 1.7.0
           - Check_MK: Added 1.2.0b3 release
           - Support Ubuntu 12.04 (Precise)
 
diff --git a/packages/icinga/.gitignore b/packages/icinga/.gitignore
index f7c9b24..1878925 100644
--- a/packages/icinga/.gitignore
+++ b/packages/icinga/.gitignore
@@ -1 +1 @@
-icinga-1.6.?
+icinga-1.7.?
diff --git a/packages/icinga/Makefile b/packages/icinga/Makefile
index 1563cf8..372470f 100644
--- a/packages/icinga/Makefile
+++ b/packages/icinga/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = icinga
-VERSION = 1.6.1
+VERSION = 1.7.0
 DIR = $(NAME)-$(VERSION)
 
 # Configure options for Icinga. Since we want to compile
diff --git a/packages/icinga/icinga-1.6.1.tar.gz b/packages/icinga/icinga-1.7.0.tar.gz
similarity index 60%
rename from packages/icinga/icinga-1.6.1.tar.gz
rename to packages/icinga/icinga-1.7.0.tar.gz
index ead2168..8fdf46e 100644
Binary files a/packages/icinga/icinga-1.6.1.tar.gz and b/packages/icinga/icinga-1.7.0.tar.gz differ


From git at mathias-kettner.de  Wed May 16 22:45:14 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 16 May 2012 22:45:14 +0200
Subject: [omd-commits] OMD Git: omd: enable retry logging
Message-ID: <20120516204514.3D9778406F6@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Wed May 16 22:43:05 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Wed May 16 22:44:15 2012 +0200

enable retry logging

---

 .../icinga/skel/etc/icinga/icinga.d/logging.cfg    |    4 ++--
 .../nagios/skel/etc/nagios/nagios.d/logging.cfg    |    4 ++--
 .../shinken/skel/etc/shinken/shinken.d/logging.cfg |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/icinga/skel/etc/icinga/icinga.d/logging.cfg b/packages/icinga/skel/etc/icinga/icinga.d/logging.cfg
index 1ae4ed0..cbbe3e3 100644
--- a/packages/icinga/skel/etc/icinga/icinga.d/logging.cfg
+++ b/packages/icinga/skel/etc/icinga/icinga.d/logging.cfg
@@ -33,13 +33,13 @@ log_notifications=1
 # If you don't want service check retries to be logged, set this value
 # to 0.  If retries should be logged, set the value to 1.
 
-log_service_retries=0
+log_service_retries=1
 
 # HOST RETRY LOGGING OPTION
 # If you don't want host check retries to be logged, set this value to
 # 0.  If retries should be logged, set the value to 1.
 
-log_host_retries=0
+log_host_retries=1
 
 # EVENT HANDLER LOGGING OPTION
 # If you don't want host and service event handlers to be logged, set
diff --git a/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg b/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg
index 1ae4ed0..cbbe3e3 100644
--- a/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg
+++ b/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg
@@ -33,13 +33,13 @@ log_notifications=1
 # If you don't want service check retries to be logged, set this value
 # to 0.  If retries should be logged, set the value to 1.
 
-log_service_retries=0
+log_service_retries=1
 
 # HOST RETRY LOGGING OPTION
 # If you don't want host check retries to be logged, set this value to
 # 0.  If retries should be logged, set the value to 1.
 
-log_host_retries=0
+log_host_retries=1
 
 # EVENT HANDLER LOGGING OPTION
 # If you don't want host and service event handlers to be logged, set
diff --git a/packages/shinken/skel/etc/shinken/shinken.d/logging.cfg b/packages/shinken/skel/etc/shinken/shinken.d/logging.cfg
index 7d1523e..5ab36af 100644
--- a/packages/shinken/skel/etc/shinken/shinken.d/logging.cfg
+++ b/packages/shinken/skel/etc/shinken/shinken.d/logging.cfg
@@ -33,13 +33,13 @@ log_notifications=1
 # If you don't want service check retries to be logged, set this value
 # to 0.  If retries should be logged, set the value to 1.
 
-log_service_retries=0
+log_service_retries=1
 
 # HOST RETRY LOGGING OPTION
 # If you don't want host check retries to be logged, set this value to
 # 0.  If retries should be logged, set the value to 1.
 
-log_host_retries=0
+log_host_retries=1
 
 # EVENT HANDLER LOGGING OPTION
 # If you don't want host and service event handlers to be logged, set


From git at mathias-kettner.de  Wed May 16 22:45:14 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 16 May 2012 22:45:14 +0200
Subject: [omd-commits] OMD Git: omd: gearmand: more flexible hook
Message-ID: <20120516204514.558CF8406EC@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   608647bd12ca8866c0de04ac060ed89e9ff51757
URL:      http://omdistro.org/projects/omd/repository/revisions/608647bd12ca8866c0de04ac060ed89e9ff51757

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Wed May 16 22:41:54 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Wed May 16 22:41:54 2012 +0200

gearmand: more flexible hook

---

 packages/gearmand/GEARMAND_PORT.hook |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/gearmand/GEARMAND_PORT.hook b/packages/gearmand/GEARMAND_PORT.hook
index 1c54fd3..7b7f970 100755
--- a/packages/gearmand/GEARMAND_PORT.hook
+++ b/packages/gearmand/GEARMAND_PORT.hook
@@ -12,7 +12,7 @@ case "$1" in
        echo "localhost:4730"
    ;;
    choices)
-       echo "[a-zA-Z0-9\.\-]*:[1-9][0-9]{0,4}"
+       echo "[a-zA-Z0-9\.\-,:]*"
    ;;
    set)
         mkdir -p $OMD_ROOT/etc/mod-gearman


From git at mathias-kettner.de  Thu May 17 09:40:13 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 09:40:13 +0200
Subject: [omd-commits] OMD Git: omd: shinken: fixed typo in init script
Message-ID: <20120517074013.7F2758406E3@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Thu May 17 09:39:23 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Thu May 17 09:39:23 2012 +0200

shinken: fixed typo in init script

---

 packages/shinken/skel/etc/init.d/shinken |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken
index 6416084..d3259b3 100644
--- a/packages/shinken/skel/etc/init.d/shinken
+++ b/packages/shinken/skel/etc/init.d/shinken
@@ -93,7 +93,7 @@ AVAIL_MODULES="scheduler poller reactionner broker arbiter"
 #
 # OMD: create configuration file out of fragments
 #
-case "$1" in start|restart|reload|checkconfig)
+case "$1" in start|restart|reload|checkconfig|check)
     #
     # Step 1
     #   etc/shinken/shinken.d/*.cfg
@@ -110,7 +110,7 @@ case "$1" in start|restart|reload|checkconfig)
     # copy etc/shinken/shinken-specific.d to tmp/shinken/shinken-specific.d
     # modify the files in tmp/shinken/shinken-specific.d
     #
-    rm -rf $TARGET_ETC/shinken.specific.d
+    rm -rf $TARGET_ETC/shinken-specific.d
     cp -r $SOURCE_ETC/shinken-specific.d $TARGET_ETC
     cat <<EOTXT > $SOURCE_ETC/shinken-specific.d/README
 Do not edit the files in this directory. They were copied over from


From git at mathias-kettner.de  Thu May 17 11:48:46 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 11:48:46 +0200
Subject: [omd-commits] OMD Git: omd: shinken: add a forgotten hook-file
Message-ID: <20120517094846.EB82384073F@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   0930bb6c455fbf89c4d7bebafcfd644427b313c7
URL:      http://omdistro.org/projects/omd/repository/revisions/0930bb6c455fbf89c4d7bebafcfd644427b313c7

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu May 17 01:29:22 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu May 17 11:13:17 2012 +0200

shinken: add a forgotten hook-file

---

 packages/shinken/MONGODB_TCP_PORT.hook             |   72 ++++++++++++++++++++
 .../shinken/skel/etc/mongodb/mongod.d/port.conf    |    2 +
 2 files changed, 74 insertions(+), 0 deletions(-)

diff --git a/packages/shinken/MONGODB_TCP_PORT.hook b/packages/shinken/MONGODB_TCP_PORT.hook
new file mode 100755
index 0000000..e4fbbfa
--- /dev/null
+++ b/packages/shinken/MONGODB_TCP_PORT.hook
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# Alias: TCP port number and listening address for MongoDB
+# Menu: Addons
+# Description: 
+#  Configure the TCP port used for the MongoDB
+#  process of this site. This option is only useful if 
+#  the CORE is set to "shinken" and MONGODB is set to "on".
+#  
+
+
+port_is_used ()
+{
+    local PORT=$1
+    ls /omd/sites/*/etc/omd/site.conf >/dev/null 2>&1 || return 1
+    for conf in /omd/sites/*/etc/omd/site.conf
+    do
+        [ $conf != /omd/sites/$OMD_SITE/etc/omd/site.conf ] || continue
+        if grep -qx "CONFIG_MONGODB_TCP_PORT='$PORT'" < $conf > /dev/null 2>&1 ; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+
+next_free_hook ()
+{
+    local PORT=$1
+    while port_is_used $PORT
+    do
+        PORT=$((PORT + 1))
+    done
+    echo "$PORT"
+}
+
+
+case "$1" in
+    default)
+        # Scan for a free port number by looking at the
+        # configuration of the other sites...
+        PORT=$(next_free_hook 27017)
+        echo "$PORT"
+    ;;
+    choices)
+        echo "([1-9][0-9]{0,5})|([a-zA-Z0-9\.\-]*:[1-9][0-9]{0,5})"
+    ;;
+    set)
+        SELECTED_PORT=${2:=localhost:27017}
+        if [ "${SELECTED_PORT##*:}" = "${SELECTED_PORT%%:*}" ]; then
+            BIND_IP=0.0.0.0
+        elif [ "${SELECTED_PORT%%:*}" = "localhost" ]; then
+            SELECTED_PORT=${SELECTED_PORT##*:}
+            BIND_IP=127.0.0.1
+        else
+            BIND_IP=${SELECTED_PORT%%:*}
+            SELECTED_PORT=999
+        fi
+        PORT=$(next_free_hook $SELECTED_PORT)
+        if [ "$PORT" != "$SELECTED_PORT" ] ; then
+            echo "MongoDB port $SELECTED_PORT is in use. I've choosen $PORT instead." >&2
+            echo "$PORT"
+        fi
+        cat <<EOF > $OMD_ROOT/etc/mongodb/port.conf
+port = $PORT
+bind_ip = $BIND_IP
+EOF
+    ;;
+    depends)
+        [ "$MONGODB" = on ]
+    ;;
+esac
diff --git a/packages/shinken/skel/etc/mongodb/mongod.d/port.conf b/packages/shinken/skel/etc/mongodb/mongod.d/port.conf
new file mode 100644
index 0000000..1c3c53d
--- /dev/null
+++ b/packages/shinken/skel/etc/mongodb/mongod.d/port.conf
@@ -0,0 +1,2 @@
+port = 27017
+bind_ip = localhost


From git at mathias-kettner.de  Thu May 17 11:48:46 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 11:48:46 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20120517094846.CED37840764@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri May 11 01:33:33 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Fri May 11 01:33:33 2012 +0200

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Thu May 17 11:48:46 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 11:48:46 +0200
Subject: [omd-commits] OMD Git: omd: shinken: add config_tcp_port for the
	mongodb
Message-ID: <20120517094846.F3A0F840761@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   4dac6a5110a78a6d36194aa4c492b79d624be0d3
URL:      http://omdistro.org/projects/omd/repository/revisions/4dac6a5110a78a6d36194aa4c492b79d624be0d3

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon May 14 14:39:41 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon May 14 14:39:41 2012 +0200

shinken: add config_tcp_port for the mongodb

---

 packages/shinken/skel/etc/init.d/mongodb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/shinken/skel/etc/init.d/mongodb b/packages/shinken/skel/etc/init.d/mongodb
index 388a5b4..3d3197b 100644
--- a/packages/shinken/skel/etc/init.d/mongodb
+++ b/packages/shinken/skel/etc/init.d/mongodb
@@ -54,7 +54,7 @@ case "$1" in start|restart|reload|checkconfig|check)
     mkdir -p $(dirname $CFG_FILE) 
     merge-nagios-config \
         ###ROOT###/etc/mongodb/mongod.cfg \
-        # ###ROOT###/etc/mongodb/mongod.d/* \
+        ###ROOT###/etc/mongodb/mongod.d/* \
         > $CFG_FILE || rm -f $CFG_FILE
 esac
 


From git at mathias-kettner.de  Thu May 17 11:48:46 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 11:48:46 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20120517094847.079F0840760@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   76eb980ee5693ddc646f0056f8285c859c3ba06f
URL:      http://omdistro.org/projects/omd/repository/revisions/76eb980ee5693ddc646f0056f8285c859c3ba06f

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu May 17 11:48:39 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu May 17 11:48:39 2012 +0200

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Thu May 17 11:48:46 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 11:48:46 +0200
Subject: [omd-commits] OMD Git: omd: shinken: add hashlib for recent shinken
	versions
Message-ID: <20120517094847.19ED5840763@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   23beb4eb46b2571983838cd897fee867d326de9e
URL:      http://omdistro.org/projects/omd/repository/revisions/23beb4eb46b2571983838cd897fee867d326de9e

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Apr 19 00:12:24 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Apr 19 00:12:24 2012 +0200

shinken: add hashlib for recent shinken versions

---

 packages/shinken/Makefile                |   16 ++++++++++++++++
 packages/shinken/hashlib-20081119.tar.gz |  Bin 0 -> 32816 bytes
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index 24492e8..673ec6b 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -48,6 +48,11 @@ PYMONGO=pymongo-2.1.1
 PYMONGO_FILE=$(PYMONGO).tar.gz
 PYMONGO_URL=http://pypi.python.org/packages/source/p/pymongo/$(PYMONGO_FILE)
 #
+# Hashlib (for Python 2.4)
+HASHLIB=hashlib-20081119
+HASHLIB_FILE=$(HASHLIB).tar.gz
+HASHLIB_URL=http://code.krypto.org/python/hashlib/$(HASHLIB_FILE)
+#
 # This is where the python modules are going to be installed to
 LOCALPYTHONDIR=$(DESTDIR)$(OMD_ROOT)/lib/python
 
@@ -82,6 +87,8 @@ build:
 	tar xzf $(PYMONGO_FILE)
 	test -f $(MONGODB_FILE) || wget $(MONGODB_URL)
 	tar xzf $(MONGODB_FILE)
+	test -f $(HASHLIB_FILE) || wget $(HASHLIB_URL)
+	tar xzf $(HASHLIB_FILE)
 	#test -f $(SQLITE_FILE) || wget $(SQLITE_URL)
 	#tar xzf $(SQLITE_FILE)
 	if [ $(DISTRO_NAME) = "CENTOS" ] && [ \
@@ -111,6 +118,7 @@ install:
 	echo "distro is " $(DISTRO_NAME)
 	if [ $(DISTRO_NAME) = "CENTOS" ]; then \
 		$(MAKE) installctypes; \
+		$(MAKE) installhashlib; \
 	fi
 	#$(MAKE) installsqlite
 	rm -rf $(TMP_DISTU)
@@ -209,6 +217,13 @@ installpymongo:
 		--install-scripts=$(DESTDIR)$(OMD_ROOT)/tmp \
 		--install-data=$(DESTDIR)$(OMD_ROOT)/tmp )
 
+installhashlib:
+	( cd $(HASHLIB) ; python setup.py install \
+		--home=$(DESTDIR)$(OMD_ROOT) \
+		--install-platlib=$(LOCALPYTHONDIR) \
+		--install-scripts=$(DESTDIR)$(OMD_ROOT)/tmp \
+		--install-data=$(DESTDIR)$(OMD_ROOT)/tmp )
+
 installmongodb:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/bin
 	for tmpfile in $(MONGODB)/bin/* ; do \
@@ -226,3 +241,4 @@ clean:
 	rm -rf $(SQLITE)
 	rm -rf $(PYMONGO)
 	rm -rf $(MONGODB)
+	rm -rf $(HASHLIB)
diff --git a/packages/shinken/hashlib-20081119.tar.gz b/packages/shinken/hashlib-20081119.tar.gz
new file mode 100644
index 0000000..3408078
Binary files /dev/null and b/packages/shinken/hashlib-20081119.tar.gz differ


From git at mathias-kettner.de  Thu May 17 11:48:46 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 11:48:46 +0200
Subject: [omd-commits] OMD Git: omd: omd: add Makefile for CentOS 5.8
Message-ID: <20120517094847.378BB8405B5@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Apr 19 00:16:59 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu Apr 19 00:16:59 2012 +0200

omd: add Makefile for CentOS 5.8

---

 distros/Makefile.CENTOS_5.8 |   70 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 deletions(-)

diff --git a/distros/Makefile.CENTOS_5.8 b/distros/Makefile.CENTOS_5.8
new file mode 100644
index 0000000..33f723a
--- /dev/null
+++ b/distros/Makefile.CENTOS_5.8
@@ -0,0 +1,70 @@
+DISTRO_CODE       = rh58
+BUILD_PACKAGES    =
+BUILD_PACKAGES   += boost141-devel
+BUILD_PACKAGES   += cairo-devel
+BUILD_PACKAGES   += expat-devel
+BUILD_PACKAGES   += fping
+BUILD_PACKAGES   += gcc
+BUILD_PACKAGES   += gcc-c++
+BUILD_PACKAGES   += libevent-devel
+BUILD_PACKAGES   += libtool-ltdl-devel
+BUILD_PACKAGES   += gd-devel
+BUILD_PACKAGES   += httpd-devel
+BUILD_PACKAGES   += libmcrypt-devel
+BUILD_PACKAGES   += libxml2-devel
+BUILD_PACKAGES   += mysql-devel
+BUILD_PACKAGES   += ncurses-devel
+BUILD_PACKAGES   += net-snmp
+BUILD_PACKAGES   += net-snmp-utils
+BUILD_PACKAGES   += openssl-devel
+BUILD_PACKAGES   += pango-devel
+BUILD_PACKAGES   += patch
+BUILD_PACKAGES   += python-devel
+BUILD_PACKAGES   += readline-devel
+BUILD_PACKAGES   += rpm-build
+BUILD_PACKAGES   += samba-client
+BUILD_PACKAGES   += uuid-devel
+BUILD_PACKAGES   += which
+OS_PACKAGES       =
+OS_PACKAGES      += boost141-program-options
+OS_PACKAGES      += curl
+OS_PACKAGES      += dialog
+OS_PACKAGES      += expat
+OS_PACKAGES      += fping
+OS_PACKAGES      += graphviz
+OS_PACKAGES      += graphviz-gd
+OS_PACKAGES      += httpd
+OS_PACKAGES      += libevent
+OS_PACKAGES      += libmcrypt
+OS_PACKAGES      += libtool-ltdl
+OS_PACKAGES      += mod_fcgid
+OS_PACKAGES      += mysql-server
+OS_PACKAGES      += net-snmp
+OS_PACKAGES      += pango
+OS_PACKAGES      += patch
+OS_PACKAGES      += perl-Net-SNMP
+OS_PACKAGES      += php
+OS_PACKAGES      += php-mbstring
+OS_PACKAGES      += php-pdo
+OS_PACKAGES      += php-gd
+OS_PACKAGES      += readline
+OS_PACKAGES      += rsync
+OS_PACKAGES      += uuid
+OS_PACKAGES      += xinetd
+USERADD_OPTIONS   = -M
+ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s
+PACKAGE_INSTALL   = yum -y makecache ; yum -y install
+ACTIVATE_INITSCRIPT = chkconfig --add %s && chkconfig %s on
+APACHE_CONF_DIR   = /etc/httpd/conf.d
+APACHE_INIT       = /etc/init.d/httpd
+APACHE_USER       = apache
+APACHE_GROUP      = apache
+APACHE_BIN        = /usr/sbin/httpd
+APACHE_CTL        = /usr/sbin/apachectl
+APACHE_MODULE_DIR = /usr/lib/httpd/modules
+APACHE_MODULE_DIR_64 = /usr/lib64/httpd/modules
+APACHE_FCGID_MODULE = mod_fcgid.so
+PHP_FCGI_BIN	  = /usr/bin/php-cgi
+APACHE_ENMOD      = true %s
+BECOME_ROOT       = su -c
+MOUNT_OPTIONS     =


From git at mathias-kettner.de  Thu May 17 14:04:43 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 17 May 2012 14:04:43 +0200
Subject: [omd-commits] OMD Git: omd: Icinga: cgi.cfg changes for icinga 1.7
Message-ID: <20120517120443.DC89C8406E3@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   84376d38200940d8e92e4e56d9420e3574550bb5
URL:      http://omdistro.org/projects/omd/repository/revisions/84376d38200940d8e92e4e56d9420e3574550bb5

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu May 17 14:03:57 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu May 17 14:03:57 2012 +0200

Icinga: cgi.cfg changes for icinga 1.7

---

 packages/icinga/skel/etc/icinga/cgi.cfg     |  369 +++++++++++++++++++++++++--
 packages/icinga/skel/etc/icinga/cgiauth.cfg |    8 +
 2 files changed, 351 insertions(+), 26 deletions(-)

Diff:   http://omdistro.org/projects/omd/repository/diff/?rev=84376d38200940d8e92e4e56d9420e3574550bb5

From git at mathias-kettner.de  Fri May 18 12:07:05 2012
From: git at mathias-kettner.de (git version control)
Date: Fri, 18 May 2012 12:07:05 +0200
Subject: [omd-commits] OMD Git: omd: ubuntu: apache needs libxml2
Message-ID: <20120518100705.4BF3384067C@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   9c5359d44d461caac50d0f7b12f1e9d3774b6636
URL:      http://omdistro.org/projects/omd/repository/revisions/9c5359d44d461caac50d0f7b12f1e9d3774b6636

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Fri May 18 12:06:28 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Fri May 18 12:06:28 2012 +0200

ubuntu: apache needs libxml2

---

 distros/Makefile.UBUNTU_12.04 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/distros/Makefile.UBUNTU_12.04 b/distros/Makefile.UBUNTU_12.04
index a3e6e3e..8d48b3f 100644
--- a/distros/Makefile.UBUNTU_12.04
+++ b/distros/Makefile.UBUNTU_12.04
@@ -47,6 +47,7 @@ OS_PACKAGES    += libperl5.14
 OS_PACKAGES    += libreadline5
 OS_PACKAGES    += libsnmp-perl
 OS_PACKAGES    += libuuid1
+OS_PACKAGES    += libxml2
 OS_PACKAGES    += mysql-server
 OS_PACKAGES    += patch
 OS_PACKAGES    += php5


From git at mathias-kettner.de  Sat May 19 21:10:31 2012
From: git at mathias-kettner.de (git version control)
Date: Sat, 19 May 2012 21:10:31 +0200
Subject: [omd-commits] OMD Git: omd: shinken: bugfix in the
	mongodb-tcp-port-hook
Message-ID: <20120519191031.862E4840800@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sat May 19 21:10:12 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sat May 19 21:10:12 2012 +0200

shinken: bugfix in the mongodb-tcp-port-hook

---

 packages/shinken/MONGODB_TCP_PORT.hook |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/shinken/MONGODB_TCP_PORT.hook b/packages/shinken/MONGODB_TCP_PORT.hook
index e4fbbfa..be1c4f8 100755
--- a/packages/shinken/MONGODB_TCP_PORT.hook
+++ b/packages/shinken/MONGODB_TCP_PORT.hook
@@ -54,19 +54,19 @@ case "$1" in
             BIND_IP=127.0.0.1
         else
             BIND_IP=${SELECTED_PORT%%:*}
-            SELECTED_PORT=999
+            SELECTED_PORT=${SELECTED_PORT##*:}
         fi
         PORT=$(next_free_hook $SELECTED_PORT)
         if [ "$PORT" != "$SELECTED_PORT" ] ; then
             echo "MongoDB port $SELECTED_PORT is in use. I've choosen $PORT instead." >&2
             echo "$PORT"
         fi
-        cat <<EOF > $OMD_ROOT/etc/mongodb/port.conf
+        cat <<EOF > $OMD_ROOT/etc/mongodb/mongod.d/port.conf
 port = $PORT
 bind_ip = $BIND_IP
 EOF
     ;;
     depends)
-        [ "$MONGODB" = on ]
+        [ "$CONFIG_MONGODB" = on ]
     ;;
 esac


From git at mathias-kettner.de  Sun May 20 23:24:55 2012
From: git at mathias-kettner.de (git version control)
Date: Sun, 20 May 2012 23:24:55 +0200
Subject: [omd-commits] OMD Git: omd: omd: add init-hook call (pre only) to
 nagios/shinken/icinga/ apache-initscripts
Message-ID: <20120520212456.01AFE84081E@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   1a819fba43dc6042559d3c9eef60a52b0788e773
URL:      http://omdistro.org/projects/omd/repository/revisions/1a819fba43dc6042559d3c9eef60a52b0788e773

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sat May 19 22:52:02 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sun May 20 23:23:56 2012 +0200

omd: add init-hook call (pre only) to nagios/shinken/icinga/apache-initscripts

---

 packages/apache-omd/skel/etc/init.d/apache         |    1 +
 packages/icinga/skel/etc/init.d/icinga             |    1 +
 packages/nagios/skel/etc/init.d/nagios             |    3 ++-
 packages/omd/skel/.profile                         |    9 +++++++++
 packages/omd/skel/etc/init-hooks.d/README          |    1 +
 .../omd/skel/etc/init-hooks.d/sample-start-pre     |    1 +
 packages/shinken/skel/etc/init.d/shinken           |    1 +
 7 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index 0123049..39159ef 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -112,6 +112,7 @@ kill_stale_php_cgis()
     done
 }
 
+init-hook $0 $1 pre
 case $1 in 
   start)
     echo -n "Starting dedicated Apache for site ###SITE###..."
diff --git a/packages/icinga/skel/etc/init.d/icinga b/packages/icinga/skel/etc/init.d/icinga
index 1ef75f1..7bf4947 100755
--- a/packages/icinga/skel/etc/init.d/icinga
+++ b/packages/icinga/skel/etc/init.d/icinga
@@ -180,6 +180,7 @@ case "$1" in start|restart|reload|checkconfig)
     fi
 esac
           
+init-hook $0 $1 pre
 case "$1" in
     start)
          echo -n "Starting icinga..."
diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios
index 54de800..5ad795d 100755
--- a/packages/nagios/skel/etc/init.d/nagios
+++ b/packages/nagios/skel/etc/init.d/nagios
@@ -160,7 +160,8 @@ case "$1" in start|restart|reload|checkconfig)
         exit 1
     fi
 esac
-          
+
+init-hook $0 $1 pre
 case "$1" in
     start)
          echo -n "Starting nagios..."
diff --git a/packages/omd/skel/.profile b/packages/omd/skel/.profile
index 74f035d..3a38c41 100644
--- a/packages/omd/skel/.profile
+++ b/packages/omd/skel/.profile
@@ -25,3 +25,12 @@ fi
 if [ "$BASH" -a -s ~/.bashrc -a -z "$BASHRC" ]; then
     . ~/.bashrc
 fi
+
+function init-hook() {
+  # Takes 3 parameters
+  # 1. Name of the init-script (can be the full path name, we will only use the file part)
+  # 2. The command the init-script was called with (start, stop, reload,..)
+  # 3. A fixed string, either "pre" os "post"
+  hook=$(printf "###ROOT###/etc/init-hooks.d/%s-%s-%s" ${1##*/} $2 $3)
+  test -x $hook && $hook ${1##*/} $2 $3
+}
diff --git a/packages/omd/skel/etc/init-hooks.d/README b/packages/omd/skel/etc/init-hooks.d/README
new file mode 100644
index 0000000..c8acb73
--- /dev/null
+++ b/packages/omd/skel/etc/init-hooks.d/README
@@ -0,0 +1 @@
+In this directory you can put blabla
diff --git a/packages/omd/skel/etc/init-hooks.d/sample-start-pre b/packages/omd/skel/etc/init-hooks.d/sample-start-pre
new file mode 100644
index 0000000..6e7f774
--- /dev/null
+++ b/packages/omd/skel/etc/init-hooks.d/sample-start-pre
@@ -0,0 +1 @@
+echo do some stuff at the beginning of the start function
diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken
index d3259b3..9a1e5af 100644
--- a/packages/shinken/skel/etc/init.d/shinken
+++ b/packages/shinken/skel/etc/init.d/shinken
@@ -427,6 +427,7 @@ do_check() {
 #
 # check for our command
 #
+init-hook $0 $1 pre
 case "$CMD" in
   start)
     [ "$VERBOSE" != no ] && echo "Starting $NAME..."


From git at mathias-kettner.de  Sun May 20 23:24:55 2012
From: git at mathias-kettner.de (git version control)
Date: Sun, 20 May 2012 23:24:55 +0200
Subject: [omd-commits] OMD Git: omd: omd: add a README to the init-hooks.d
	directory
Message-ID: <20120520212456.1AA5184067C@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sun May 20 23:24:07 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sun May 20 23:24:07 2012 +0200

omd: add a README to the init-hooks.d directory

---

 packages/apache-omd/skel/etc/init.d/apache |    4 +++-
 packages/icinga/skel/etc/init.d/icinga     |    2 +-
 packages/nagios/skel/etc/init.d/nagios     |    2 +-
 packages/omd/skel/.profile                 |    2 +-
 packages/omd/skel/etc/init-hooks.d/README  |   22 +++++++++++++++++++++-
 packages/shinken/skel/etc/init.d/shinken   |    2 +-
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index 39159ef..70fb4a9 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd ###ROOT###
+. ###ROOT###/.profile
 . ###ROOT###/etc/omd/site.conf
 if [ "$CONFIG_APACHE_MODE" != own ] ; then
   exit 5
@@ -112,7 +114,7 @@ kill_stale_php_cgis()
     done
 }
 
-init-hook $0 $1 pre
+__init_hook $0 $1 pre
 case $1 in 
   start)
     echo -n "Starting dedicated Apache for site ###SITE###..."
diff --git a/packages/icinga/skel/etc/init.d/icinga b/packages/icinga/skel/etc/init.d/icinga
index 7bf4947..0fa3f4f 100755
--- a/packages/icinga/skel/etc/init.d/icinga
+++ b/packages/icinga/skel/etc/init.d/icinga
@@ -180,7 +180,7 @@ case "$1" in start|restart|reload|checkconfig)
     fi
 esac
           
-init-hook $0 $1 pre
+__init_hook $0 $1 pre
 case "$1" in
     start)
          echo -n "Starting icinga..."
diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios
index 5ad795d..1a8aa63 100755
--- a/packages/nagios/skel/etc/init.d/nagios
+++ b/packages/nagios/skel/etc/init.d/nagios
@@ -161,7 +161,7 @@ case "$1" in start|restart|reload|checkconfig)
     fi
 esac
 
-init-hook $0 $1 pre
+__init_hook $0 $1 pre
 case "$1" in
     start)
          echo -n "Starting nagios..."
diff --git a/packages/omd/skel/.profile b/packages/omd/skel/.profile
index 3a38c41..77dfb5c 100644
--- a/packages/omd/skel/.profile
+++ b/packages/omd/skel/.profile
@@ -26,7 +26,7 @@ if [ "$BASH" -a -s ~/.bashrc -a -z "$BASHRC" ]; then
     . ~/.bashrc
 fi
 
-function init-hook() {
+__init_hook() {
   # Takes 3 parameters
   # 1. Name of the init-script (can be the full path name, we will only use the file part)
   # 2. The command the init-script was called with (start, stop, reload,..)
diff --git a/packages/omd/skel/etc/init-hooks.d/README b/packages/omd/skel/etc/init-hooks.d/README
index c8acb73..89fa3d1 100644
--- a/packages/omd/skel/etc/init-hooks.d/README
+++ b/packages/omd/skel/etc/init-hooks.d/README
@@ -1 +1,21 @@
-In this directory you can put blabla
+In this directory you can put your own custom scripts which extend the startstop-scripts in etc/init.d
+
+The init-hook-scripts are executed by the init-scripts before or after a certain operation. This is defined by following a naming scheme. 
+
+<name of the init-script>-<name of the operation>-<pre or post>
+
+Example:
+nagios-reload-pre will be executed when you run "etc/init.d/nagios reload" or "omd reload nagios" just before the actual reload.
+
+
+Real-live use case:
+Imagine your etc/nagios/conf.d/myconfig is the clone of a git repository. Whenever you reload Nagios, the init-hook-script will do a 
+cd etc/nagios/conf.d/myconfig
+git pull
+and update the config files from the central repository. Then the actual reload follows.
+
+Currently only the following scripts can be used, all others are ignored:
+nagios-*-pre
+shinken-*-pre
+icinga-*-pre
+apache-*-pre
diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken
index 9a1e5af..fc183a8 100644
--- a/packages/shinken/skel/etc/init.d/shinken
+++ b/packages/shinken/skel/etc/init.d/shinken
@@ -427,7 +427,7 @@ do_check() {
 #
 # check for our command
 #
-init-hook $0 $1 pre
+__init_hook $0 $1 pre
 case "$CMD" in
   start)
     [ "$VERBOSE" != no ] && echo "Starting $NAME..."


From git at mathias-kettner.de  Mon May 21 12:20:27 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 21 May 2012 12:20:27 +0200
Subject: [omd-commits] OMD Git: omd: omd: added apache start/stop post hooks
Message-ID: <20120521102028.0399A84067C@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Mon May 21 11:24:54 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Mon May 21 12:19:20 2012 +0200

omd: added apache start/stop post hooks

---

 packages/apache-omd/skel/etc/init.d/apache         |    4 ++++
 packages/omd/skel/.profile                         |    2 +-
 packages/omd/skel/etc/init-hooks.d/README          |   19 ++++++++++++++-----
 packages/thruk/skel.permissions                    |    1 +
 .../skel/etc/init-hooks.d/apache-start-post.sample |    9 +++++++++
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/packages/apache-omd/skel/etc/init.d/apache b/packages/apache-omd/skel/etc/init.d/apache
index 70fb4a9..e98d6f7 100644
--- a/packages/apache-omd/skel/etc/init.d/apache
+++ b/packages/apache-omd/skel/etc/init.d/apache
@@ -119,9 +119,11 @@ case $1 in
   start)
     echo -n "Starting dedicated Apache for site ###SITE###..."
     if apache_wait_start; then
+      __init_hook $0 $1 post 0
       echo 'OK'
       exit 0
     else
+      __init_hook $0 $1 post 1
       echo 'ERROR'
       exit 1
     fi
@@ -129,9 +131,11 @@ case $1 in
   stop)
     echo -n "Stopping dedicated Apache for site ###SITE###..."
     if apache_wait_stop; then
+      __init_hook $0 $1 post 0
       echo 'OK'
       exit 0
     else
+      __init_hook $0 $1 post 1
       echo 'ERROR'
       exit 1
     fi
diff --git a/packages/omd/skel/.profile b/packages/omd/skel/.profile
index 77dfb5c..49735c6 100644
--- a/packages/omd/skel/.profile
+++ b/packages/omd/skel/.profile
@@ -32,5 +32,5 @@ __init_hook() {
   # 2. The command the init-script was called with (start, stop, reload,..)
   # 3. A fixed string, either "pre" os "post"
   hook=$(printf "###ROOT###/etc/init-hooks.d/%s-%s-%s" ${1##*/} $2 $3)
-  test -x $hook && $hook ${1##*/} $2 $3
+  test -x $hook && $hook ${1##*/} $2 $3 $4
 }
diff --git a/packages/omd/skel/etc/init-hooks.d/README b/packages/omd/skel/etc/init-hooks.d/README
index 89fa3d1..37acae6 100644
--- a/packages/omd/skel/etc/init-hooks.d/README
+++ b/packages/omd/skel/etc/init-hooks.d/README
@@ -1,21 +1,30 @@
 In this directory you can put your own custom scripts which extend the startstop-scripts in etc/init.d
 
-The init-hook-scripts are executed by the init-scripts before or after a certain operation. This is defined by following a naming scheme. 
+The init-hook-scripts are executed by the init-scripts before or after a certain operation. This is defined by following a naming scheme.
 
 <name of the init-script>-<name of the operation>-<pre or post>
 
+Post scripts will be run with the exit code of the actual script as
+parameter.
+
 Example:
 nagios-reload-pre will be executed when you run "etc/init.d/nagios reload" or "omd reload nagios" just before the actual reload.
 
 
 Real-live use case:
-Imagine your etc/nagios/conf.d/myconfig is the clone of a git repository. Whenever you reload Nagios, the init-hook-script will do a 
-cd etc/nagios/conf.d/myconfig
-git pull
-and update the config files from the central repository. Then the actual reload follows.
+ - Imagine your etc/nagios/conf.d/myconfig is the clone of a git repository. Whenever you reload Nagios, the init-hook-script will do a
+   cd etc/nagios/conf.d/myconfig
+   git pull
+   and update the config files from the central repository. Then the actual reload follows.
+
+ - Apache stops all fcgi servers on stop ( and therefor on logfile
+   rotation ). There is a sample script which start Thruks fcgi daemon
+   after the apache reload.
 
 Currently only the following scripts can be used, all others are ignored:
 nagios-*-pre
 shinken-*-pre
 icinga-*-pre
 apache-*-pre
+apache-start-post
+apache-stop-post
diff --git a/packages/thruk/skel.permissions b/packages/thruk/skel.permissions
index 8c36d82..38ddf39 100644
--- a/packages/thruk/skel.permissions
+++ b/packages/thruk/skel.permissions
@@ -2,3 +2,4 @@ var/log/thruk.log 0664
 etc/thruk/fcgid_env.sh 0755
 tmp/thruk 0775
 var/thruk 0775
+etc/init-hooks.d/apache-start-pre.sample 0775
diff --git a/packages/thruk/skel/etc/init-hooks.d/apache-start-post.sample b/packages/thruk/skel/etc/init-hooks.d/apache-start-post.sample
new file mode 100644
index 0000000..bc47bf6
--- /dev/null
+++ b/packages/thruk/skel/etc/init-hooks.d/apache-start-post.sample
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# arguments are:
+# <initscriptname> <start|stop> <pre|post> <init script exitcode>
+
+# check return code of apache start
+if [ $4 = 0 ]; then
+  ./etc/init.d/thruk start
+fi


From git at mathias-kettner.de  Mon May 21 17:24:41 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 21 May 2012 17:24:41 +0200
Subject: [omd-commits] OMD Git: omd: Check_MK: new version 1.2.0b4
Message-ID: <20120521152441.C1A7184067C@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   74bd6d97cf84043694f274a9f3f66637d66de14f
URL:      http://omdistro.org/projects/omd/repository/revisions/74bd6d97cf84043694f274a9f3f66637d66de14f

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Mon May 21 17:21:17 2012 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Mon May 21 17:21:17 2012 +0200

Check_MK: new version 1.2.0b4

---

 Changelog                                          |    2 +-
 packages/check_mk/Makefile                         |    2 +-
 ...k_mk-1.2.0b3.tar.gz => check_mk-1.2.0b4.tar.gz} |  Bin 11345820 -> 11430703 bytes
 packages/check_mk/skel/etc/check_mk/defaults       |    2 +-
 packages/check_mk/skel/etc/check_mk/multisite.mk   |   22 ++++++++++----------
 packages/mk-livestatus/Makefile                    |    2 +-
 .../mk-livestatus/mk-livestatus-1.1.12p7.tar.gz    |  Bin 342792 -> 0 bytes
 .../mk-livestatus/mk-livestatus-1.2.0b4.tar.gz     |  Bin 0 -> 371654 bytes
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Changelog b/Changelog
index b4f3613..8ab1b3d 100644
--- a/Changelog
+++ b/Changelog
@@ -9,7 +9,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Mod-Gearman: Updated to version 1.3.0
           - Thruk: Update to 1.28
           - Icinga: Update to 1.7.0
-          - Check_MK: Added 1.2.0b3 release
+          - Check_MK: Added 1.2.0b4 release
           - Support Ubuntu 12.04 (Precise)
 
 0.54     Apr 02 2012
diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index adebe96..25ca9c9 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.0b3
+VERSION = 1.2.0b4
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_mk/check_mk-1.2.0b3.tar.gz b/packages/check_mk/check_mk-1.2.0b4.tar.gz
similarity index 58%
rename from packages/check_mk/check_mk-1.2.0b3.tar.gz
rename to packages/check_mk/check_mk-1.2.0b4.tar.gz
index 8f06278..e53e399 100644
Binary files a/packages/check_mk/check_mk-1.2.0b3.tar.gz and b/packages/check_mk/check_mk-1.2.0b4.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index db97e00..d4d1107 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.0b3'
+check_mk_version            = '1.2.0b4'
 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 f1b37bf..91a6d6c 100644
--- a/packages/check_mk/skel/etc/check_mk/multisite.mk
+++ b/packages/check_mk/skel/etc/check_mk/multisite.mk
@@ -53,23 +53,23 @@ custom_links['guest'] = [
 # but some in addition
 custom_links['user'] = custom_links['guest'] + [
   ( "Open Source Components", False, [
-        ( "Multisite",     "http://mathias-kettner.de/checkmk_multisite.html" ),
-        ( "MK Livestatus", "http://mathias-kettner.de/checkmk_livestatus.html" ),
-        ( "Check_MK",      "http://mathias-kettner.de/check_mk.html" ),
-        ( "Nagios",        "http://www.nagios.org/" ), 
-        ( "PNP4Nagios",    "http://pnp4nagios.org/" ),
-        ( "NagVis",        "http://nagvis.org/" ),
-        ( "RRDTool",       "http://oss.oetiker.ch/rrdtool/" ),
+        ( "Multisite",     "http://mathias-kettner.de/checkmk_multisite.html", None, "_blank"),
+        ( "MK Livestatus", "http://mathias-kettner.de/checkmk_livestatus.html", None, "_blank"),
+        ( "Check_MK",      "http://mathias-kettner.de/check_mk.html", None, "_blank"),
+        ( "Nagios",        "http://www.nagios.org/", None, "_blank"), 
+        ( "PNP4Nagios",    "http://pnp4nagios.org/", None, "_blank"),
+        ( "NagVis",        "http://nagvis.org/", None, "_blank"),
+        ( "RRDTool",       "http://oss.oetiker.ch/rrdtool/", None, "_blank"),
    ])
 ]
 
 # The admins yet get further links
 custom_links['admin'] = custom_links['user'] + [
   ( "Support", False, [
-      ( "Mathias Kettner",              "http://mathias-kettner.de/" ),
-      ( "Check_MK Mailinglists",        "http://mathias-kettner.de/check_mk_lists.html" ),
-      ( "Check_MK Portal (inofficial)", "http://check-mk-portal.org/"),
-      ( "Nagios Portal (German)",       "http://nagios-portal.org"),
+      ( "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"),
   ])
 ]
 
diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile
index 6dccbc7..7ca6ebf 100644
--- a/packages/mk-livestatus/Makefile
+++ b/packages/mk-livestatus/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = mk-livestatus
-VERSION = 1.1.12p7
+VERSION = 1.2.0b4
 DIR = $(NAME)-$(VERSION)
 
 CONFIGUREOPTS = \
diff --git a/packages/mk-livestatus/mk-livestatus-1.1.12p7.tar.gz b/packages/mk-livestatus/mk-livestatus-1.1.12p7.tar.gz
deleted file mode 100644
index c9b7d9d..0000000
Binary files a/packages/mk-livestatus/mk-livestatus-1.1.12p7.tar.gz and /dev/null differ
diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0b4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0b4.tar.gz
new file mode 100644
index 0000000..7690468
Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.0b4.tar.gz differ


From git at mathias-kettner.de  Tue May 22 21:01:35 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 May 2012 21:01:35 +0200
Subject: [omd-commits] OMD Git: omd: check_logfiles: update to 3.5
Message-ID: <20120522190136.3BBAF84083B@mail.mathias-kettner.de>

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Tue May 22 20:53:06 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Tue May 22 20:53:06 2012 +0200

check_logfiles: update to 3.5

---

 packages/check_logfiles/Makefile                   |    2 +-
 .../check_logfiles/check_logfiles-3.4.5.2.tar.gz   |  Bin 194212 -> 0 bytes
 packages/check_logfiles/check_logfiles-3.5.tar.gz  |  Bin 0 -> 201891 bytes
 3 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/check_logfiles/Makefile b/packages/check_logfiles/Makefile
index ba2c3ed..be987ab 100644
--- a/packages/check_logfiles/Makefile
+++ b/packages/check_logfiles/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = check_logfiles
-VERSION = 3.4.5.2
+VERSION = 3.5
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_logfiles/check_logfiles-3.4.5.2.tar.gz b/packages/check_logfiles/check_logfiles-3.4.5.2.tar.gz
deleted file mode 100644
index ac1a816..0000000
Binary files a/packages/check_logfiles/check_logfiles-3.4.5.2.tar.gz and /dev/null differ
diff --git a/packages/check_logfiles/check_logfiles-3.5.tar.gz b/packages/check_logfiles/check_logfiles-3.5.tar.gz
new file mode 100644
index 0000000..8ae7380
Binary files /dev/null and b/packages/check_logfiles/check_logfiles-3.5.tar.gz differ


From git at mathias-kettner.de  Tue May 22 21:14:16 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 May 2012 21:14:16 +0200
Subject: [omd-commits] OMD Git: omd: perl modules: GD - fix overriden cc
	flags
Message-ID: <20120522191416.EE2E384083B@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Tue May 22 21:13:20 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Tue May 22 21:14:04 2012 +0200

perl modules: GD - fix overriden cc flags

 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
 - https://rt.cpan.org/Public/Bug/Display.html?id=67990

---

 packages/perl-modules/src/GD-2.46.tar.gz |  Bin 260989 -> 264024 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/perl-modules/src/GD-2.46.tar.gz b/packages/perl-modules/src/GD-2.46.tar.gz
index 46981d3..d131a32 100644
Binary files a/packages/perl-modules/src/GD-2.46.tar.gz and b/packages/perl-modules/src/GD-2.46.tar.gz differ


From git at mathias-kettner.de  Tue May 22 21:19:03 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 22 May 2012 21:19:03 +0200
Subject: [omd-commits] OMD Git: omd: ubuntu12: remove useless meta php
	package
Message-ID: <20120522191903.A26DD84083B@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   093bae0486fd1e06457c3d8c0265acfaa0a3f570
URL:      http://omdistro.org/projects/omd/repository/revisions/093bae0486fd1e06457c3d8c0265acfaa0a3f570

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Tue May 22 21:16:09 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Tue May 22 21:18:34 2012 +0200

ubuntu12: remove useless meta php package

Installing php5 meta package removes apache2-mpm-worker and installs
apache2-mpm-prefork for no reason. php dependency is already resolved
by installing php-cgi/cli.

---

 distros/Makefile.UBUNTU_12.04 |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/distros/Makefile.UBUNTU_12.04 b/distros/Makefile.UBUNTU_12.04
index 8d48b3f..aa37f26 100644
--- a/distros/Makefile.UBUNTU_12.04
+++ b/distros/Makefile.UBUNTU_12.04
@@ -50,7 +50,6 @@ OS_PACKAGES    += libuuid1
 OS_PACKAGES    += libxml2
 OS_PACKAGES    += mysql-server
 OS_PACKAGES    += patch
-OS_PACKAGES    += php5
 OS_PACKAGES    += php5-cli
 OS_PACKAGES    += php5-cgi
 OS_PACKAGES    += php5-gd


From git at mathias-kettner.de  Thu May 24 23:43:33 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 24 May 2012 23:43:33 +0200
Subject: [omd-commits] OMD Git: omd: shinken: switch back to sqlite when
 mongodb is disabled
Message-ID: <20120524214333.55D018422F5@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   2ee0807a03f24bfd50c6613f463b5ca34e75a3af
URL:      http://omdistro.org/projects/omd/repository/revisions/2ee0807a03f24bfd50c6613f463b5ca34e75a3af

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu May 24 23:43:06 2012 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Thu May 24 23:43:06 2012 +0200

shinken: switch back to sqlite when mongodb is disabled

---

 packages/shinken/skel/etc/init.d/shinken |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken
index fc183a8..57f2fc1 100644
--- a/packages/shinken/skel/etc/init.d/shinken
+++ b/packages/shinken/skel/etc/init.d/shinken
@@ -169,6 +169,8 @@ EOTXT
     #fi
     if [ "$MONGODB" = "on" ]; then
       sed -ri 's/^([[:space:]]*modules[[:space:]]*)(.+)/\1mongologs/' $TARGET_ETC/shinken-specific.d/module_livestatus.cfg
+    else
+      sed -ri 's/^([[:space:]]*modules[[:space:]]*)(.+)/\1sqlitelogs/' $TARGET_ETC/shinken-specific.d/module_livestatus.cfg
     fi
 
     #


From git at mathias-kettner.de  Fri May 25 16:41:12 2012
From: git at mathias-kettner.de (git version control)
Date: Fri, 25 May 2012 16:41:12 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20120525144112.B347C84083F@mail.mathias-kettner.de>

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

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri May 25 15:59:52 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri May 25 15:59:52 2012 +0200

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Fri May 25 16:41:12 2012
From: git at mathias-kettner.de (git version control)
Date: Fri, 25 May 2012 16:41:12 +0200
Subject: [omd-commits] OMD Git: omd: Check_MK: Updated to latest release
Message-ID: <20120525144112.D230A840838@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   368c452235a7f82d0c649598250f90aedfdb128b
URL:      http://omdistro.org/projects/omd/repository/revisions/368c452235a7f82d0c649598250f90aedfdb128b

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri May 25 15:58:23 2012 +0200
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Fri May 25 15:58:23 2012 +0200

Check_MK: Updated to latest release

---

 Changelog                                          |    2 +-
 packages/check_mk/Makefile                         |    2 +-
 ...k_mk-1.2.0b4.tar.gz => check_mk-1.2.0b5.tar.gz} |  Bin 11430703 -> 11477458 bytes
 packages/check_mk/skel/etc/check_mk/defaults       |    3 +--
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 8ab1b3d..65c7899 100644
--- a/Changelog
+++ b/Changelog
@@ -9,7 +9,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Mod-Gearman: Updated to version 1.3.0
           - Thruk: Update to 1.28
           - Icinga: Update to 1.7.0
-          - Check_MK: Added 1.2.0b4 release
+          - Check_MK: Added 1.2.0b5 release
           - Support Ubuntu 12.04 (Precise)
 
 0.54     Apr 02 2012
diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile
index 25ca9c9..40e7363 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.0b4
+VERSION = 1.2.0b5
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/check_mk/check_mk-1.2.0b4.tar.gz b/packages/check_mk/check_mk-1.2.0b5.tar.gz
similarity index 72%
rename from packages/check_mk/check_mk-1.2.0b4.tar.gz
rename to packages/check_mk/check_mk-1.2.0b5.tar.gz
index e53e399..25f7282 100644
Binary files a/packages/check_mk/check_mk-1.2.0b4.tar.gz and b/packages/check_mk/check_mk-1.2.0b5.tar.gz differ
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index d4d1107..3a698fa 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.0b4'
+check_mk_version            = '1.2.0b5'
 default_config_dir          = '###ROOT###/etc/check_mk'
 check_mk_configdir          = '###ROOT###/etc/check_mk/conf.d'
 share_dir                   = '###ROOT###/share/check_mk'
@@ -31,7 +31,6 @@ nagios_user                 = '###SITE###'
 www_group                   = '###SITE###'
 nagios_url                  = '/###SITE###/nagios'
 nagios_cgi_url              = '/###SITE###/nagios/cgi-bin'
-checkmk_web_uri             = '/###SITE###/check_mk'
 pnp_url                     = '/###SITE###/pnp4nagios/'
 logwatch_notes_url          = '/###SITE###/check_mk/logwatch.py?host=%s&file=%s'
 nagios_config_file          = '###ROOT###/tmp/nagios/nagios.cfg'


From git at mathias-kettner.de  Tue May 29 10:34:06 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 29 May 2012 10:34:06 +0200
Subject: [omd-commits] OMD Git: omd: Dokuwiki: New Auth Module Mulisite (not
	as default)
Message-ID: <20120529083406.B98DC84088C@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   463df25d5522dce65d3711f2d922365a287a5a87
URL:      http://omdistro.org/projects/omd/repository/revisions/463df25d5522dce65d3711f2d922365a287a5a87

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Tue May 29 10:26:08 2012 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Tue May 29 10:26:08 2012 +0200

Dokuwiki: New Auth Module Mulisite (not as default)

---

 packages/dokuwiki/Makefile                    |    1 +
 packages/dokuwiki/skel/etc/dokuwiki/local.php |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/packages/dokuwiki/Makefile b/packages/dokuwiki/Makefile
index 8e9abb6..1117bf8 100644
--- a/packages/dokuwiki/Makefile
+++ b/packages/dokuwiki/Makefile
@@ -21,6 +21,7 @@ build:
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/share/dokuwiki
 	cp preload.php $(DIR)/inc/
+        cp multisite.class.php $(DIR)/inc/auth/
 	touch $(DIR)/lib/plugins/plugin/disabled
 	touch $(DIR)/conf $(DIR)/data
 	rm -r $(DIR)/conf $(DIR)/data
diff --git a/packages/dokuwiki/skel/etc/dokuwiki/local.php b/packages/dokuwiki/skel/etc/dokuwiki/local.php
index 025d3fd..0317994 100644
--- a/packages/dokuwiki/skel/etc/dokuwiki/local.php
+++ b/packages/dokuwiki/skel/etc/dokuwiki/local.php
@@ -5,4 +5,6 @@ $conf['useacl'] = 1;
 $conf['superuser'] = '@admin';
 $conf['template']='arctic';
 $conf['tpl']['arctic']['left_sidebar_content'] = 'index';
+$conf['multisite']['authfile'] = '/omd/sites/###SITE###/var/check_mk/wato/auth/auth.php';
+$conf['multisite']['auth_secret'] = '/omd/sites/###SITE###/etc/auth.secret';
 ?>


From git at mathias-kettner.de  Tue May 29 10:34:06 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 29 May 2012 10:34:06 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20120529083406.D06728405E7@mail.mathias-kettner.de>

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

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Tue May 29 10:33:48 2012 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Tue May 29 10:33:48 2012 +0200

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Tue May 29 11:06:44 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 29 May 2012 11:06:44 +0200
Subject: [omd-commits] OMD Git: omd: Mod-Gearman: Update 1.3.2
Message-ID: <20120529090644.6346C84062C@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   530f339a39a24fa4f89eeac4b656640fc60f7fe0
URL:      http://omdistro.org/projects/omd/repository/revisions/530f339a39a24fa4f89eeac4b656640fc60f7fe0

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Tue May 29 11:06:08 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Tue May 29 11:06:08 2012 +0200

Mod-Gearman: Update 1.3.2

---

 Changelog                                     |    2 +-
 packages/mod-gearman/Makefile                 |    2 +-
 packages/mod-gearman/mod_gearman-1.3.0.tar.gz |  Bin 303777 -> 0 bytes
 packages/mod-gearman/mod_gearman-1.3.2.tar.gz |  Bin 0 -> 304029 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 65c7899..fdb9620 100644
--- a/Changelog
+++ b/Changelog
@@ -6,7 +6,7 @@ This file documents the revision history for the Open Monitoring Distribution
               whole tmp/ directory but only the contents
           - RPMS: Not checking for removed version during pkg release update
                  (Does not mean omd version update.)
-          - Mod-Gearman: Updated to version 1.3.0
+          - Mod-Gearman: Updated to version 1.3.2
           - Thruk: Update to 1.28
           - Icinga: Update to 1.7.0
           - Check_MK: Added 1.2.0b5 release
diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index 50042ce..5df9b0d 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = mod_gearman
-VERSION  = 1.3.0
+VERSION  = 1.3.2
 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }')
 DIR      = mod_gearman-$(VERSION)
 
diff --git a/packages/mod-gearman/mod_gearman-1.3.0.tar.gz b/packages/mod-gearman/mod_gearman-1.3.0.tar.gz
deleted file mode 100644
index b1d0626..0000000
Binary files a/packages/mod-gearman/mod_gearman-1.3.0.tar.gz and /dev/null differ
diff --git a/packages/mod-gearman/mod_gearman-1.3.2.tar.gz b/packages/mod-gearman/mod_gearman-1.3.2.tar.gz
new file mode 100644
index 0000000..0d57923
Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.3.2.tar.gz differ


From git at mathias-kettner.de  Wed May 30 09:14:41 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 30 May 2012 09:14:41 +0200
Subject: [omd-commits] OMD Git: omd: Fixed dokuwiki Makefile
Message-ID: <20120530071441.C16DF8412BB@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   23956d8953cf18e32c0d7cfa9b25b453f6bcefa5
URL:      http://omdistro.org/projects/omd/repository/revisions/23956d8953cf18e32c0d7cfa9b25b453f6bcefa5

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Wed May 30 09:13:21 2012 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Wed May 30 09:13:21 2012 +0200

Fixed dokuwiki Makefile

---

 packages/dokuwiki/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/dokuwiki/Makefile b/packages/dokuwiki/Makefile
index 1117bf8..43e0e81 100644
--- a/packages/dokuwiki/Makefile
+++ b/packages/dokuwiki/Makefile
@@ -21,7 +21,7 @@ build:
 install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/share/dokuwiki
 	cp preload.php $(DIR)/inc/
-        cp multisite.class.php $(DIR)/inc/auth/
+	cp multisite.class.php $(DIR)/inc/auth/
 	touch $(DIR)/lib/plugins/plugin/disabled
 	touch $(DIR)/conf $(DIR)/data
 	rm -r $(DIR)/conf $(DIR)/data


From git at mathias-kettner.de  Wed May 30 09:14:41 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 30 May 2012 09:14:41 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20120530071441.D012A84062C@mail.mathias-kettner.de>

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

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Wed May 30 09:13:46 2012 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Wed May 30 09:13:46 2012 +0200

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Wed May 30 09:39:26 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 30 May 2012 09:39:26 +0200
Subject: [omd-commits] OMD Git: omd: Added multisite class
Message-ID: <20120530073926.DF7A78412BB@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   2e6aef73be73da2b0f176490fc345c9238d3f83b
URL:      http://omdistro.org/projects/omd/repository/revisions/2e6aef73be73da2b0f176490fc345c9238d3f83b

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Wed May 30 09:39:20 2012 +0200
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Wed May 30 09:39:20 2012 +0200

Added multisite class

---

 packages/dokuwiki/multisite.class.php |   70 +++++++++++++++++++++++++++++++++
 1 files changed, 70 insertions(+), 0 deletions(-)

diff --git a/packages/dokuwiki/multisite.class.php b/packages/dokuwiki/multisite.class.php
new file mode 100644
index 0000000..77352c0
--- /dev/null
+++ b/packages/dokuwiki/multisite.class.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * auth/multisite.class.php
+ *
+ * Login against the Check_MK Multisite API 
+ *
+ * @author    Bastian Kuhn <bk at mathias-kettner.de>
+ */
+
+class auth_multisite extends auth_basic {
+
+  var $success = true;
+  var $cando = array (
+    'addUser'     => false, // can Users be created?
+    'delUser'     => false, // can Users be deleted?
+    'modLogin'    => false, // can login names be changed?
+    'modPass'     => false, // can passwords be changed?
+    'modName'     => false, // can real names be changed?
+    'modMail'     => false, // can emails be changed?
+    'modGroups'   => false, // can groups be changed?
+    'getUsers'    => false, // can a (filtered) list of users be retrieved?
+    'getUserCount'=> false, // can the number of users be retrieved?
+    'getGroups'   => false, // can a list of available groups be retrieved?
+    'external'    => true, // does the module do external auth checking?
+    'logout'      => false,  // can the user logout again? (eg. not possible with HTTP auth)
+  );
+
+  function auth_basic() {
+  }
+
+
+  function trustExternal($user,$pass,$sticky=false){
+      global $conf;
+      global $USERINFO;
+      foreach(array_keys($_COOKIE) AS $cookieName) 
+      {
+        if(substr($cookieName, 0, 5) != 'auth_'){ 
+           continue;
+        }
+
+        if(!isset($_COOKIE[$cookieName]) || $_COOKIE[$cookieName] == ''){
+            continue;
+        }
+        list($username, $issueTime, $cookieHash) = explode(':', $_COOKIE[$cookieName], 3);
+
+        require_once($conf['multisite']['authfile']);
+        if(!isset($mk_users[$username])){
+            continue;
+        }
+        $secret = trim(file_get_contents($conf['multisite']['auth_secret']));
+        if(md5($username . $issueTime . $mk_users[$username]['password'] . $secret) == $cookieHash)
+        {
+            $USERINFO['name'] = $username;
+            $USERINFO['grps'] = $mk_users[$username]['roles'];
+            $_SERVER['REMOTE_USER'] = $username;
+            $_SESSION[DOKU_COOKIE]['auth']['user'] = $username;
+            $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
+            return true;
+        }else
+        {
+            continue;
+        }
+      }
+      header('Location:../check_mk/login.py?_origtarget=' . $_SERVER['REQUEST_URI']);
+      return false;
+  }
+
+
+}
+//Setup VIM: ex: et ts=2 :