From git at mathias-kettner.de  Mon Jul  2 14:36:32 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 02 Jul 2012 14:36:32 +0200
Subject: [omd-commits] OMD Git: omd: notifications: map newlines before
	ascii extraction
Message-ID: <20120702123632.BA7E38422AC@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at consol.de>
Date:     Mon Jul  2 14:36:04 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Mon Jul  2 14:36:04 2012 +0200

notifications: map newlines before ascii extraction

---

 packages/notifications-tt/notify-by-email.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/notifications-tt/notify-by-email.pl b/packages/notifications-tt/notify-by-email.pl
index d98f72e..b52273b 100755
--- a/packages/notifications-tt/notify-by-email.pl
+++ b/packages/notifications-tt/notify-by-email.pl
@@ -34,6 +34,7 @@ if ( ! -e $template ){
 	exit 3;
 }
 
+map($macro{$_} =~ s/\\n/\n/gmx, keys %macro);
 extract_ascii($macro{'LONGHOSTOUTPUT'});
 extract_ascii($macro{'LONGSERVICEOUTPUT'});
 process_template();
@@ -47,7 +48,6 @@ sub process_template {
 		$data .= "$_";
 	}
 	close FILE;
-	map($macro{$_} =~ s/\\n/\n/gmx, keys %macro);
 	my $template = Template->new({PRE_CHOMP => 1, POST_CHOMP => 0});
 	$template->process(\$data, \%macro, \$output);
 	print $output if $verbose;


From git at mathias-kettner.de  Mon Jul  2 22:43:19 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 02 Jul 2012 22:43:19 +0200
Subject: [omd-commits] OMD Git: omd: Revert "PNP4Nagios: Update to 0.6.18"
Message-ID: <20120702204319.A3A5D8422AC@mail.mathias-kettner.de>

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

Author:   Matthias Flacke <matthias.flacke at gmx.de>
Date:     Sat Jun 30 22:22:19 2012 +0200
Commiter: Matthias Flacke <matthias.flacke at gmx.de>
Date:     Sat Jun 30 22:22:19 2012 +0200

Revert "PNP4Nagios: Update to 0.6.18"

This reverts commit 7d30017326bc4fdd45fe781c03c94f2f8e33047e.

---

 Changelog                                          |    1 -
 packages/check_mk/MULTISITE_COOKIE_AUTH.hook       |    7 +--
 packages/pnp4nagios/Makefile                       |   10 ++--
 packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz       |  Bin 0 -> 3006336 bytes
 packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz       |  Bin 3021602 -> 0 bytes
 .../pnp4nagios/check_commands/check_jmx4perl.cfg   |   46 --------------------
 packages/pnp4nagios/skel/etc/pnp4nagios/config.php |   30 -------------
 7 files changed, 8 insertions(+), 86 deletions(-)

diff --git a/Changelog b/Changelog
index 142a5e8..6bd0a35 100644
--- a/Changelog
+++ b/Changelog
@@ -11,7 +11,6 @@ This file documents the revision history for the Open Monitoring Distribution
           - Mod-Gearman: Updated to version 1.3.4
           - Thruk: Update to 1.34
           - Nagios Plugins: Update to 1.4.16
-          - PNP4Nagios: Update to 0.6.18
           - Icinga: Update to 1.7.1
           - Check_MK: Added 1.2.0p1 release
           - Support Ubuntu 12.04 (Precise)
diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
index c757688..da14647 100755
--- a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -44,10 +44,9 @@ EOF
 // 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';
-\$conf['auth_multisite_login_url']  = '/$OMD_SITE/check_mk/login.py';
+\$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
diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile
index 4cf01d9..ab35d53 100644
--- a/packages/pnp4nagios/Makefile
+++ b/packages/pnp4nagios/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME = pnp4nagios
-VERSION = 0.6.18
+VERSION = 0.6.17
 DIR = $(NAME)-$(VERSION)
 
 # Configure options for PNP4Nagios. Since we want to compile
@@ -27,10 +27,10 @@ CONFIGUREOPTS = \
 
 build:
 	tar xzf $(DIR).tar.gz
-#	for p in patches/*.dif ; do \
-#		echo "applying $$p..." ; \
-#		( cd $(DIR) ; patch -p1 -b ) < $$p ; \
-#       done
+	#for p in patches/*.dif ; do \
+	#	echo "applying $$p..." ; \
+	#	( cd $(DIR) ; patch -p1 -b ) < $$p ; \
+        #done
 
 	cd $(DIR) ; ./configure $(CONFIGUREOPTS)
 	$(MAKE) -C $(DIR) all
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz
new file mode 100644
index 0000000..e6c2d85
Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz differ
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz
deleted file mode 100644
index 4d39c7e..0000000
Binary files a/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz and /dev/null differ
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg b/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg
deleted file mode 100644
index ed038db..0000000
--- a/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Adapt the Template if check_command should not be the PNP Template
-#
-# check_command check_jmx4perl!memory
-# ________0__________|             |
-# ________1________________________| 
-#
-# Use ARG0,ARG1 
-CUSTOM_TEMPLATE = 0,1
-#
-# Change the RRD Datatype based on the check_command Name.
-# Defaults to GAUGE.
-# 
-# Adjust the whole RRD Database 
-# DATATYPE = COUNTER
-#
-# Adjust every single DS by using a List of Datatypes.
-# DATATYPE = GAUGE,GAUGE,COUNTER,COUNTER
-
-# Use the MIN value for newly created RRD Databases. 
-# This value defaults to 0
-# USE_MIN_ON_CREATE = 1
-#
-# Use the MAX value for newly created RRD Databases.
-# This value defaults to 0
-# USE_MAX_ON_CREATE = 1
-
-# Use a single RRD Database per Service 
-# This Option is only used while creating new RRD Databases
-#
-# RRD_STORAGE_TYPE = SINGLE
-#
-# Use multiple RRD Databases per Service
-# One RRD Database per Datasource.
-# RRD_STORAGE_TYPE = MULTIPLE
-#
-# RRD_STORAGE_TYPE = SINGLE
-
-# RRD Heartbeat in seconds
-# This Option is only used while creating new RRD Databases
-# Existing RRDs can be changed by "rrdtool tune"
-# More on http://oss.oetiker.ch/rrdtool/doc/rrdtune.en.html
-#
-# This value defaults to 8640
-# RRD_HEARTBEAT = 305
-
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
index 818edce..1fc8ca5 100644
--- a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
+++ b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
@@ -227,34 +227,4 @@ $conf['special_template_dir'] = '###ROOT###/etc/pnp4nagios/templates.special';
 # This regex is evaluated against the USER_AGENT String
 #
 $conf['mobile_devices'] = 'iPhone|iPod|iPad|android';
-
-#
-# additional colour schemes
-# values taken from www.colorbrewer2.org
-# for details on usage refer to the documentation of the helper functions 
-#
-$scheme['Reds']     = array ('#FEE0D2','#FCBBA1','#FC9272','#FB6A4A','#EF3B2C','#CB181D','#A50F15','#67000D');
-$scheme['Greens']   = array ('#E5F5E0','#C7E9C0','#A1D99B','#74C476','#41AB5D','#23AB45','#006D2C','#00441B');
-$scheme['Blues']    = array ('#DEEBF7','#C6DBEF','#9ECAE1','#6BAED6','#4292C6','#2171B5','#08519C','#08306B');
-$scheme['Oranges']  = array ('#FEE6CE','#FDD0A2','#FDAE6B','#FD8D3C','#F16913','#D94801','#A63603','#7F2704');
-$scheme['Purples']  = array ('#EFEDF5','#DADAEB','#BDBDDC','#9E9AC8','#807DBA','#6A51A3','#54278F','#3F007A');
-$scheme['RdPu']     = array ('#FDE0DD','#FCC5C0','#FA9FB5','#F768A1','#DD3497','#AE017E','#7A0177','#49006A');
-$scheme['Dark2']    = array ('#1B9E77','#D95F02','#7570B3','#E7298A','#66A61E','#E6ab02','#a6761d','#666666');
-$scheme['BrBG']     = array ('#543005','#8C510A','#BF812D','#DFC27D','#F6E8C3','#C7EAE5','#80CDC1','#35978F','#01665E','#003C30');
-$scheme['PiYG']     = array ('#8E0152','#C51B7D','#DE77AE','#F1B6DA','#FDE0EF','#E6F5D0','#B8E186','#7FBC41','#4D9221','#276419');
-$scheme['PRGn']     = array ('#40004B','#762A83','#9970AB','#C2A5CF','#E7D4E8','#D9F0D3','#A6DBA0','#5AAE61','#1B7837','#00441B');
-$scheme['PuOr']     = array ('#7F3B08','#B35806','#E08214','#FDB863','#FEE0B6','#D8DAEB','#B2ABD2','#8073AC','#542788','#2D004B');
-$scheme['RdBu']     = array ('#67001F','#B2182B','#D6604D','#F4A582','#FDDBC7','#D1E5F0','#92C5DE','#4393C3','#2166AC','#053061');
-$scheme['RdGy']     = array ('#67001F','#B2182B','#D6604D','#F4A582','#FDDBC7','#E0E0E0','#BABABA','#878787','#4D4D4D','#1A1A1A');
-$scheme['RdYlBu']   = array ('#A50026','#D73027','#F46D43','#FDAE61','#FEE090','#E0F3F8','#ABD9E9','#74ADD1','#4575B4','#313695');
-$scheme['RdYlGn']   = array ('#A50026','#D73027','#F46D43','#FDAE61','#FEE08B','#D9EF8B','#A6D96A','#66BD63','#1A9850','#006837');
-$scheme['Spectral'] = array ('#9E0142','#D53E4F','#F46D43','#FDAE61','#FEE08B','#E6F598','#ABDDA4','#66C2A5','#3288BD','#5E4FA2');
-$scheme['Paired']   = array ('#A6CEE3','#1F78B4','#B2DF8A','#33A02C','#FB9A99','#E31A1C','#FDBF6F','#FF7F00','#CAB2D6','#6A3D9A');
-$scheme['mixed1']   = array ('#8C510A','#2166ac','#BF812D','#4393c3','#DFC27D','#92c5de','#F6E8C3','#d1e5f0',
-                             '#fddbc7','#C7EAE5','#f4a582','#80CDC1','#d6604d','#35978F','#b2182b','#01665E');
-$scheme['mixed2']   = array ('#b2182b','#2166ac','#d6604d','#4393c3','#f4a582','#92c5de','#fddbc7','#d1e5f0',
-                             '#F6E8C3','#C7EAE5','#DFC27D','#80CDC1','#BF812D','#35978F','#8C510A','#01665E');
-$scheme['mixed3']   = array ('#67001F','#80CDC1','#B2182B','#35978F','#D6604D','#01665E','#F4A582','#003C30',
-                             '#FDDBC7','#92C5DE','#D1E5F0','#2166AC','#4393C3','#8C510A','#053061','#BF812D');
-
 ?>


From git at mathias-kettner.de  Mon Jul  2 22:43:19 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 02 Jul 2012 22:43:19 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
 http://git.mathias-kettner.de/omd
Message-ID: <20120702204319.B686984115D@mail.mathias-kettner.de>

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

Author:   Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:33:29 2012 +0200
Commiter: Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:33:29 2012 +0200

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

---




From git at mathias-kettner.de  Mon Jul  2 22:43:19 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 02 Jul 2012 22:43:19 +0200
Subject: [omd-commits] OMD Git: omd: check_multi: update to 0.26_533
Message-ID: <20120702204319.C26A8841429@mail.mathias-kettner.de>

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

Author:   Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:38:06 2012 +0200
Commiter: Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:38:06 2012 +0200

check_multi: update to 0.26_533

---

 packages/check_multi/Makefile                      |    2 +-
 .../check_multi/check_multi-latest-6b22e5f.tar.gz  |  Bin 0 -> 129304 bytes
 .../check_multi/check_multi-latest-856c76a.tar.gz  |  Bin 129195 -> 0 bytes
 3 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/check_multi/Makefile b/packages/check_multi/Makefile
index 738b7ce..b5a30bd 100644
--- a/packages/check_multi/Makefile
+++ b/packages/check_multi/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME     = check_multi
-VERSION  = 856c76a
+VERSION  = 6b22e5f
 SRCDIR   = $(NAME)-$(VERSION)
 ROOTDIR  = \\\$$ENV{OMD_ROOT}
 SITE     = \\\$$ENV{OMD_SITE}
diff --git a/packages/check_multi/check_multi-latest-6b22e5f.tar.gz b/packages/check_multi/check_multi-latest-6b22e5f.tar.gz
new file mode 100644
index 0000000..e1f6bd0
Binary files /dev/null and b/packages/check_multi/check_multi-latest-6b22e5f.tar.gz differ
diff --git a/packages/check_multi/check_multi-latest-856c76a.tar.gz b/packages/check_multi/check_multi-latest-856c76a.tar.gz
deleted file mode 100644
index a39d117..0000000
Binary files a/packages/check_multi/check_multi-latest-856c76a.tar.gz and /dev/null differ


From git at mathias-kettner.de  Mon Jul  2 23:03:32 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 02 Jul 2012 23:03:32 +0200
Subject: [omd-commits] OMD Git: omd: Ups, revert PNP revert...
Message-ID: <20120702210332.40519841429@mail.mathias-kettner.de>

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

Author:   Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:54:46 2012 +0200
Commiter: Matthias Flacke <matthias.flacke at gmx.de>
Date:     Mon Jul  2 22:54:46 2012 +0200

Ups, revert PNP revert...

Sorry Joerg, this accidently remained in my local repo!

---

 Changelog                                          |    1 +
 packages/check_mk/MULTISITE_COOKIE_AUTH.hook       |    7 ++-
 packages/pnp4nagios/Makefile                       |   10 ++--
 packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz       |  Bin 3006336 -> 0 bytes
 packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz       |  Bin 0 -> 3021602 bytes
 .../pnp4nagios/check_commands/check_jmx4perl.cfg   |   46 ++++++++++++++++++++
 packages/pnp4nagios/skel/etc/pnp4nagios/config.php |   30 +++++++++++++
 7 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/Changelog b/Changelog
index 6bd0a35..142a5e8 100644
--- a/Changelog
+++ b/Changelog
@@ -11,6 +11,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Mod-Gearman: Updated to version 1.3.4
           - Thruk: Update to 1.34
           - Nagios Plugins: Update to 1.4.16
+          - PNP4Nagios: Update to 0.6.18
           - Icinga: Update to 1.7.1
           - Check_MK: Added 1.2.0p1 release
           - Support Ubuntu 12.04 (Precise)
diff --git a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
index da14647..c757688 100755
--- a/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
+++ b/packages/check_mk/MULTISITE_COOKIE_AUTH.hook
@@ -44,9 +44,10 @@ EOF
 // 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';
+\$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';
+\$conf['auth_multisite_login_url']  = '/$OMD_SITE/check_mk/login.py';
 ?>
 EOF
        else
diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile
index ab35d53..4cf01d9 100644
--- a/packages/pnp4nagios/Makefile
+++ b/packages/pnp4nagios/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME = pnp4nagios
-VERSION = 0.6.17
+VERSION = 0.6.18
 DIR = $(NAME)-$(VERSION)
 
 # Configure options for PNP4Nagios. Since we want to compile
@@ -27,10 +27,10 @@ CONFIGUREOPTS = \
 
 build:
 	tar xzf $(DIR).tar.gz
-	#for p in patches/*.dif ; do \
-	#	echo "applying $$p..." ; \
-	#	( cd $(DIR) ; patch -p1 -b ) < $$p ; \
-        #done
+#	for p in patches/*.dif ; do \
+#		echo "applying $$p..." ; \
+#		( cd $(DIR) ; patch -p1 -b ) < $$p ; \
+#       done
 
 	cd $(DIR) ; ./configure $(CONFIGUREOPTS)
 	$(MAKE) -C $(DIR) all
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz
deleted file mode 100644
index e6c2d85..0000000
Binary files a/packages/pnp4nagios/pnp4nagios-0.6.17.tar.gz and /dev/null differ
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz
new file mode 100644
index 0000000..4d39c7e
Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.18.tar.gz differ
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg b/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg
new file mode 100644
index 0000000..ed038db
--- /dev/null
+++ b/packages/pnp4nagios/skel/etc/pnp4nagios/check_commands/check_jmx4perl.cfg
@@ -0,0 +1,46 @@
+#
+# Adapt the Template if check_command should not be the PNP Template
+#
+# check_command check_jmx4perl!memory
+# ________0__________|             |
+# ________1________________________| 
+#
+# Use ARG0,ARG1 
+CUSTOM_TEMPLATE = 0,1
+#
+# Change the RRD Datatype based on the check_command Name.
+# Defaults to GAUGE.
+# 
+# Adjust the whole RRD Database 
+# DATATYPE = COUNTER
+#
+# Adjust every single DS by using a List of Datatypes.
+# DATATYPE = GAUGE,GAUGE,COUNTER,COUNTER
+
+# Use the MIN value for newly created RRD Databases. 
+# This value defaults to 0
+# USE_MIN_ON_CREATE = 1
+#
+# Use the MAX value for newly created RRD Databases.
+# This value defaults to 0
+# USE_MAX_ON_CREATE = 1
+
+# Use a single RRD Database per Service 
+# This Option is only used while creating new RRD Databases
+#
+# RRD_STORAGE_TYPE = SINGLE
+#
+# Use multiple RRD Databases per Service
+# One RRD Database per Datasource.
+# RRD_STORAGE_TYPE = MULTIPLE
+#
+# RRD_STORAGE_TYPE = SINGLE
+
+# RRD Heartbeat in seconds
+# This Option is only used while creating new RRD Databases
+# Existing RRDs can be changed by "rrdtool tune"
+# More on http://oss.oetiker.ch/rrdtool/doc/rrdtune.en.html
+#
+# This value defaults to 8640
+# RRD_HEARTBEAT = 305
+
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
index 1fc8ca5..818edce 100644
--- a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
+++ b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
@@ -227,4 +227,34 @@ $conf['special_template_dir'] = '###ROOT###/etc/pnp4nagios/templates.special';
 # This regex is evaluated against the USER_AGENT String
 #
 $conf['mobile_devices'] = 'iPhone|iPod|iPad|android';
+
+#
+# additional colour schemes
+# values taken from www.colorbrewer2.org
+# for details on usage refer to the documentation of the helper functions 
+#
+$scheme['Reds']     = array ('#FEE0D2','#FCBBA1','#FC9272','#FB6A4A','#EF3B2C','#CB181D','#A50F15','#67000D');
+$scheme['Greens']   = array ('#E5F5E0','#C7E9C0','#A1D99B','#74C476','#41AB5D','#23AB45','#006D2C','#00441B');
+$scheme['Blues']    = array ('#DEEBF7','#C6DBEF','#9ECAE1','#6BAED6','#4292C6','#2171B5','#08519C','#08306B');
+$scheme['Oranges']  = array ('#FEE6CE','#FDD0A2','#FDAE6B','#FD8D3C','#F16913','#D94801','#A63603','#7F2704');
+$scheme['Purples']  = array ('#EFEDF5','#DADAEB','#BDBDDC','#9E9AC8','#807DBA','#6A51A3','#54278F','#3F007A');
+$scheme['RdPu']     = array ('#FDE0DD','#FCC5C0','#FA9FB5','#F768A1','#DD3497','#AE017E','#7A0177','#49006A');
+$scheme['Dark2']    = array ('#1B9E77','#D95F02','#7570B3','#E7298A','#66A61E','#E6ab02','#a6761d','#666666');
+$scheme['BrBG']     = array ('#543005','#8C510A','#BF812D','#DFC27D','#F6E8C3','#C7EAE5','#80CDC1','#35978F','#01665E','#003C30');
+$scheme['PiYG']     = array ('#8E0152','#C51B7D','#DE77AE','#F1B6DA','#FDE0EF','#E6F5D0','#B8E186','#7FBC41','#4D9221','#276419');
+$scheme['PRGn']     = array ('#40004B','#762A83','#9970AB','#C2A5CF','#E7D4E8','#D9F0D3','#A6DBA0','#5AAE61','#1B7837','#00441B');
+$scheme['PuOr']     = array ('#7F3B08','#B35806','#E08214','#FDB863','#FEE0B6','#D8DAEB','#B2ABD2','#8073AC','#542788','#2D004B');
+$scheme['RdBu']     = array ('#67001F','#B2182B','#D6604D','#F4A582','#FDDBC7','#D1E5F0','#92C5DE','#4393C3','#2166AC','#053061');
+$scheme['RdGy']     = array ('#67001F','#B2182B','#D6604D','#F4A582','#FDDBC7','#E0E0E0','#BABABA','#878787','#4D4D4D','#1A1A1A');
+$scheme['RdYlBu']   = array ('#A50026','#D73027','#F46D43','#FDAE61','#FEE090','#E0F3F8','#ABD9E9','#74ADD1','#4575B4','#313695');
+$scheme['RdYlGn']   = array ('#A50026','#D73027','#F46D43','#FDAE61','#FEE08B','#D9EF8B','#A6D96A','#66BD63','#1A9850','#006837');
+$scheme['Spectral'] = array ('#9E0142','#D53E4F','#F46D43','#FDAE61','#FEE08B','#E6F598','#ABDDA4','#66C2A5','#3288BD','#5E4FA2');
+$scheme['Paired']   = array ('#A6CEE3','#1F78B4','#B2DF8A','#33A02C','#FB9A99','#E31A1C','#FDBF6F','#FF7F00','#CAB2D6','#6A3D9A');
+$scheme['mixed1']   = array ('#8C510A','#2166ac','#BF812D','#4393c3','#DFC27D','#92c5de','#F6E8C3','#d1e5f0',
+                             '#fddbc7','#C7EAE5','#f4a582','#80CDC1','#d6604d','#35978F','#b2182b','#01665E');
+$scheme['mixed2']   = array ('#b2182b','#2166ac','#d6604d','#4393c3','#f4a582','#92c5de','#fddbc7','#d1e5f0',
+                             '#F6E8C3','#C7EAE5','#DFC27D','#80CDC1','#BF812D','#35978F','#8C510A','#01665E');
+$scheme['mixed3']   = array ('#67001F','#80CDC1','#B2182B','#35978F','#D6604D','#01665E','#F4A582','#003C30',
+                             '#FDDBC7','#92C5DE','#D1E5F0','#2166AC','#4393C3','#8C510A','#053061','#BF812D');
+
 ?>


From git at mathias-kettner.de  Wed Jul  4 11:29:13 2012
From: git at mathias-kettner.de (git version control)
Date: Wed, 04 Jul 2012 11:29:13 +0200
Subject: [omd-commits] OMD Git: omd: Check_MK: New version 1.2.0p2
Message-ID: <20120704092915.ACBB784309C@mail.mathias-kettner.de>

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

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

Check_MK: New version 1.2.0p2

---

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

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


From git at mathias-kettner.de  Thu Jul  5 14:46:48 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 05 Jul 2012 14:46:48 +0200
Subject: [omd-commits] OMD Git: omd: perl: make cpan work on wheezy and
	precise
Message-ID: <20120705124648.83A968402B0@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at consol.de>
Date:     Thu Jul  5 11:45:35 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Thu Jul  5 13:58:36 2012 +0200

perl: make cpan work on wheezy and precise

---

 packages/omd/skel/.bashrc              |    1 +
 packages/perl-modules/Makefile         |    5 +++--
 packages/perl-modules/bin/cpan.wrapper |    8 ++++++++
 packages/perl-modules/skel.permissions |    1 +
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/omd/skel/.bashrc b/packages/omd/skel/.bashrc
index 0259189..ab0e03d 100644
--- a/packages/omd/skel/.bashrc
+++ b/packages/omd/skel/.bashrc
@@ -11,6 +11,7 @@ if [ -z $OMD_ROOT ]; then
     . ~/.profile
     cd ~
 fi
+alias cpan='cpan.wrapper'
 
 # pointless unless running interactively
 if [ "$PS1" ]; then
diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile
index ae00de8..4fd13b9 100644
--- a/packages/perl-modules/Makefile
+++ b/packages/perl-modules/Makefile
@@ -349,13 +349,14 @@ build:
 	    ./build_module.pl -p $(P5TMPDIST)/dest $(MODULES)
 	cd $(P5TMPDIST)/dest/lib/perl5/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm .
 	mkdir -p $(P5TMPDIST)/dest/lib/perl5/CPAN
-	cp MyConfig.pm $(P5TMPDIST)/dest/lib/perl5/CPAN/MyConfig.pm
+	cp MyConfig.pm $(P5TMPDIST)/dest/lib/perl5/CPAN/MyConfig.skel
 
 install:
 	if [ -z $(DESTDIR) ]; then echo "cannot install without DESTDIR set!"; exit 1; fi
-	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/perl5
+	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/perl5 $(DESTDIR)$(OMD_ROOT)/bin
 	rsync -a $(P5TMPDIST)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/local/lib/perl5
+	cp bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper
 
 skel:
 	echo "install  --install_base  ###ROOT###/local/lib/perl5" > $(SKEL)/.modulebuildrc
diff --git a/packages/perl-modules/bin/cpan.wrapper b/packages/perl-modules/bin/cpan.wrapper
new file mode 100644
index 0000000..c08d855
--- /dev/null
+++ b/packages/perl-modules/bin/cpan.wrapper
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ ! -e $OMD_ROOT/.cpan/CPAN/MyConfig.pm ]; then
+  mkdir -p $OMD_ROOT/.cpan/CPAN
+  cp $OMD_ROOT/lib/perl5/lib/perl5/CPAN/MyConfig.skel $OMD_ROOT/.cpan/CPAN/MyConfig.pm
+fi
+
+exec cpan
diff --git a/packages/perl-modules/skel.permissions b/packages/perl-modules/skel.permissions
new file mode 100644
index 0000000..aabdc01
--- /dev/null
+++ b/packages/perl-modules/skel.permissions
@@ -0,0 +1 @@
+bin/cpan.wrapper 0770


From git at mathias-kettner.de  Thu Jul 12 08:41:06 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 12 Jul 2012 08:41:06 +0200
Subject: [omd-commits] OMD Git: omd: pnp4nagios: new hook named "npcd" to
 switch to Bulk Mode with NPCD
Message-ID: <20120712064107.73FB38427FD@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu Jul 12 08:35:19 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu Jul 12 08:35:19 2012 +0200

pnp4nagios: new hook named "npcd" to switch to Bulk Mode with NPCD

---

 packages/pnp4nagios/PNP4NAGIOS.hook                |   12 +++++-
 packages/pnp4nagios/skel/etc/init.d/npcd           |    2 +-
 .../skel/etc/nagios/conf.d/pnp4nagios.cfg          |   10 +++++
 .../pnp4nagios/skel/etc/pnp4nagios/nagios_npcd.cfg |   22 ++++++++++
 t/20-package_pnp4nagios.t                          |   42 +++++++++++++++++++-
 5 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/packages/pnp4nagios/PNP4NAGIOS.hook b/packages/pnp4nagios/PNP4NAGIOS.hook
index 41f0093..31b61dd 100755
--- a/packages/pnp4nagios/PNP4NAGIOS.hook
+++ b/packages/pnp4nagios/PNP4NAGIOS.hook
@@ -14,7 +14,8 @@ case "$1" in
        echo "on"
    ;;
    choices)
-       echo "on: enable"
+       echo "on: enable bulk mode with npcdmod and npcd"
+       echo "npcd: enable bulk mode with npcd"
        echo "gearman: enable gearman worker"
        echo "off: disable"
    ;;
@@ -44,6 +45,15 @@ case "$1" in
            if [ -s $OMD_ROOT/etc/mod-gearman/perfdata.conf ]; then
                sed -i -e 's/^perfdata=.*$/perfdata=yes/' $OMD_ROOT/etc/mod-gearman/perfdata.conf
            fi
+       elif [ "$2" == "npcd" ]
+       then
+           if [ -e $OMD_ROOT/etc/nagios/nagios.d ] ; then
+               ln -sfn ../../pnp4nagios/nagios_npcd.cfg $OMD_ROOT/etc/nagios/nagios.d/pnp4nagios.cfg
+           fi
+           if [ -e $OMD_ROOT/etc/icinga/icinga.d ] ; then
+               ln -sfn ../../pnp4nagios/nagios_npcd.cfg $OMD_ROOT/etc/icinga/icinga.d/pnp4nagios.cfg
+           fi 
+           ln -sfn ../../pnp4nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/pnp4nagios.conf
        else
            rm -f $OMD_ROOT/etc/nagios/nagios.d/pnp4nagios.cfg
            rm -f $OMD_ROOT/etc/icinga/icinga.d/pnp4nagios.cfg
diff --git a/packages/pnp4nagios/skel/etc/init.d/npcd b/packages/pnp4nagios/skel/etc/init.d/npcd
index 1c2f945..c79fb2c 100644
--- a/packages/pnp4nagios/skel/etc/init.d/npcd
+++ b/packages/pnp4nagios/skel/etc/init.d/npcd
@@ -93,7 +93,7 @@ fi
 #### OMD ### 
 # Start only if PNP is enabled
 . ###ROOT###/etc/omd/site.conf
-if [ "$CONFIG_PNP4NAGIOS" != on ] ; then
+if ( [ "$CONFIG_PNP4NAGIOS" != on ] && [ "$CONFIG_PNP4NAGIOS" != npcd ] ) ; then
     exit 5
 fi
 
diff --git a/packages/pnp4nagios/skel/etc/nagios/conf.d/pnp4nagios.cfg b/packages/pnp4nagios/skel/etc/nagios/conf.d/pnp4nagios.cfg
index 82af7d9..6fb9be4 100644
--- a/packages/pnp4nagios/skel/etc/nagios/conf.d/pnp4nagios.cfg
+++ b/packages/pnp4nagios/skel/etc/nagios/conf.d/pnp4nagios.cfg
@@ -16,3 +16,13 @@ define service {
    register             0
 }
 
+define command{
+       command_name    omd-process-service-perfdata-file
+       command_line    /bin/mv ###ROOT###/var/pnp4nagios/service-perfdata ###ROOT###/var/pnp4nagios/spool/service-perfdata.$TIMET$
+}
+
+define command{
+       command_name    omd-process-host-perfdata-file
+       command_line    /bin/mv ###ROOT###/var/pnp4nagios/host-perfdata ###ROOT###/var/pnp4nagios/spool/host-perfdata.$TIMET$
+}
+
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/nagios_npcd.cfg b/packages/pnp4nagios/skel/etc/pnp4nagios/nagios_npcd.cfg
new file mode 100644
index 0000000..f0fe7af
--- /dev/null
+++ b/packages/pnp4nagios/skel/etc/pnp4nagios/nagios_npcd.cfg
@@ -0,0 +1,22 @@
+#
+# PNP4Nagios Bulk Mode with npcd
+# 
+process_performance_data=1
+
+#
+# service performance data
+#
+service_perfdata_file=###ROOT###/var/pnp4nagios/service-perfdata
+service_perfdata_file_template=DATATYPE::SERVICEPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tSERVICEDESC::$SERVICEDESC$\tSERVICEPERFDATA::$SERVICEPERFDATA$\tSERVICECHECKCOMMAND::$SERVICECHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$\tSERVICESTATE::$SERVICESTATE$\tSERVICESTATETYPE::$SERVICESTATETYPE$
+service_perfdata_file_mode=a
+service_perfdata_file_processing_interval=15
+service_perfdata_file_processing_command=omd-process-service-perfdata-file
+
+#
+# host performance data
+# 
+host_perfdata_file=###ROOT###/var/pnp4nagios/host-perfdata
+host_perfdata_file_template=DATATYPE::HOSTPERFDATA\tTIMET::$TIMET$\tHOSTNAME::$HOSTNAME$\tHOSTPERFDATA::$HOSTPERFDATA$\tHOSTCHECKCOMMAND::$HOSTCHECKCOMMAND$\tHOSTSTATE::$HOSTSTATE$\tHOSTSTATETYPE::$HOSTSTATETYPE$
+host_perfdata_file_mode=a
+host_perfdata_file_processing_interval=15
+host_perfdata_file_processing_command=omd-process-host-perfdata-file
diff --git a/t/20-package_pnp4nagios.t b/t/20-package_pnp4nagios.t
index 2785d2c..5a0035b 100644
--- a/t/20-package_pnp4nagios.t
+++ b/t/20-package_pnp4nagios.t
@@ -13,7 +13,7 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
-plan( tests => 103 );
+plan( tests => 153 );
 
 ##################################################
 # create our test site
@@ -70,3 +70,43 @@ for my $test (@{$tests}) {
 ##################################################
 # cleanup test site
 TestUtils::remove_test_site($site);
+
+##################################################
+# Create test Site for npcd test
+
+$site = TestUtils::create_test_site() or TestUtils::bail_out_clean("no further testing without site");
+
+# create test host/service
+TestUtils::prepare_obj_config('t/data/omd/testconf1', '/omd/sites/'.$site.'/etc/nagios/conf.d', $site);
+
+# decrease pnp interval
+TestUtils::test_command({ cmd => "/usr/bin/env sed -i -e 's/^perfdata_file_processing_interval = 15/perfdata_file_processing_interval = 2/g' -e 's/^sleep_time = 15/sleep_time = 2/g' /opt/omd/sites/$site/etc/pnp4nagios/npcd.cfg" });
+
+##################################################
+# prepare initial data
+TestUtils::test_command({ cmd => $omd_bin." config $site set PNP4NAGIOS npcd" });
+TestUtils::test_command({ cmd => $omd_bin." start $site" });
+# submit a forced check, so we have initial perf data
+TestUtils::test_command({ cmd => "/bin/su - $site -c './lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/nagios/cgi-bin/cmd.cgi -e 200 -P \"cmd_typ=7&cmd_mod=2&host=omd-$site&service=Dummy+Service&start_time=2010-11-06+09%3A46%3A02&force_check=on&btnSubmit=Commit\" -r \"Your command request was successfully submitted\"'", like => '/HTTP OK:/' });
+TestUtils::wait_for_file("/omd/sites/$site/var/pnp4nagios/perfdata/omd-$site/Dummy_Service_omd-dummy.rrd", 60) or TestUtils::bail_out_clean("No need to test pnp without existing rrd");;
+
+
+##################################################
+# then execute some checks
+$tests = [
+  { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -u /$site/pnp4nagios -e 401'",                           like => '/HTTP OK:/' },
+  { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/pnp4nagios -e 301'",           like => '/HTTP OK:/' },
+  { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/pnp4nagios/index.php -e 302'", like => '/HTTP OK:/' },
+  { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u /$site/pnp4nagios/graph?host=omd-$site -e 200'", like => '/HTTP OK:/' },
+  { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u \"/$site/pnp4nagios/graph?host=omd-$site&srv=Dummy+Service\" -e 200'", like => '/HTTP OK:/' },
+  { cmd => "/bin/su - $site -c 'lib/nagios/plugins/check_http -H localhost -a omdadmin:omd -u \"/$site/pnp4nagios/image?host=omd-$site&srv=Dummy+Service\" -e 200'", like => '/HTTP OK:/' },
+  { cmd => $omd_bin." stop $site" },
+];
+for my $test (@{$tests}) {
+    TestUtils::test_command($test);
+}
+
+##################################################
+# cleanup test site
+TestUtils::remove_test_site($site);
+


From git at mathias-kettner.de  Thu Jul 12 19:24:54 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 12 Jul 2012 19:24:54 +0200
Subject: [omd-commits] OMD Git: omd: omd: Call zypper with -r to recognize
 all given package names on OpenSuSE 12.1
Message-ID: <20120712172454.CC1B08428FC@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu Jul 12 19:23:27 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu Jul 12 19:23:27 2012 +0200

omd: Call zypper with -r to recognize all given package names on OpenSuSE 12.1

---

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

diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1
index a7369bd..f248a1b 100644
--- a/distros/Makefile.OPENSUSE_12.1
+++ b/distros/Makefile.OPENSUSE_12.1
@@ -64,7 +64,7 @@ OS_PACKAGES    += xinetd
 OS_PACKAGES    += xorg-x11-fonts
 USERADD_OPTIONS   = -M
 ADD_USER_TO_GROUP = groupmod -A %(user)s %(group)s
-PACKAGE_INSTALL   = zypper -n refresh ; zypper -n install
+PACKAGE_INSTALL   = zypper -n refresh ; zypper -r -n install
 ACTIVATE_INITSCRIPT = chkconfig --add %s
 APACHE_CONF_DIR   = /etc/apache2/conf.d
 APACHE_INIT       = /etc/init.d/apache2


From git at mathias-kettner.de  Thu Jul 12 19:24:54 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 12 Jul 2012 19:24:54 +0200
Subject: [omd-commits] OMD Git: omd: pnp4nagios: unset CONFIG_SITE to avoid
 problems on OpenSuSE 12.1
Message-ID: <20120712172455.022B78428DD@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu Jul 12 19:21:39 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Thu Jul 12 19:21:39 2012 +0200

pnp4nagios: unset CONFIG_SITE to avoid problems on OpenSuSE 12.1

---

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

diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile
index 4cf01d9..c2e1420 100644
--- a/packages/pnp4nagios/Makefile
+++ b/packages/pnp4nagios/Makefile
@@ -5,6 +5,8 @@ include ../../Makefile.omd
 NAME = pnp4nagios
 VERSION = 0.6.18
 DIR = $(NAME)-$(VERSION)
+# Unset CONFIG_SITE
+CONFIG_SITE = ''
 
 # Configure options for PNP4Nagios. Since we want to compile
 # as non-root, we use our own user and group for compiling.


From git at mathias-kettner.de  Sat Jul 14 14:18:59 2012
From: git at mathias-kettner.de (git version control)
Date: Sat, 14 Jul 2012 14:18:59 +0200
Subject: [omd-commits] OMD Git: omd: Opensuse 12.1 Makefile: remove zypper
	option -r
Message-ID: <20120714121859.D92BD84116A@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sat Jul 14 14:18:52 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sat Jul 14 14:18:52 2012 +0200

Opensuse 12.1 Makefile: remove zypper option -r

---

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

diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1
index f248a1b..27c00ae 100644
--- a/distros/Makefile.OPENSUSE_12.1
+++ b/distros/Makefile.OPENSUSE_12.1
@@ -1,4 +1,5 @@
 DISTRO_CODE     = opensuse121
+CONFIG_SITE	= '' 
 BUILD_PACKAGES  =
 BUILD_PACKAGES += boost-devel
 BUILD_PACKAGES += cairo-devel
@@ -64,7 +65,7 @@ OS_PACKAGES    += xinetd
 OS_PACKAGES    += xorg-x11-fonts
 USERADD_OPTIONS   = -M
 ADD_USER_TO_GROUP = groupmod -A %(user)s %(group)s
-PACKAGE_INSTALL   = zypper -n refresh ; zypper -r -n install
+PACKAGE_INSTALL   = zypper -n refresh ; zypper -n install
 ACTIVATE_INITSCRIPT = chkconfig --add %s
 APACHE_CONF_DIR   = /etc/apache2/conf.d
 APACHE_INIT       = /etc/init.d/apache2


From git at mathias-kettner.de  Sat Jul 14 15:07:43 2012
From: git at mathias-kettner.de (git version control)
Date: Sat, 14 Jul 2012 15:07:43 +0200
Subject: [omd-commits] OMD Git: omd: Opensuse 12.1 Makefile: PACKAGE_INSTALL
 added zypper -n install -n
Message-ID: <20120714130743.4DB1D84116A@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sat Jul 14 15:07:37 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Sat Jul 14 15:07:37 2012 +0200

Opensuse 12.1 Makefile: PACKAGE_INSTALL added zypper -n install -n

---

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

diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1
index 27c00ae..42d305f 100644
--- a/distros/Makefile.OPENSUSE_12.1
+++ b/distros/Makefile.OPENSUSE_12.1
@@ -65,7 +65,7 @@ OS_PACKAGES    += xinetd
 OS_PACKAGES    += xorg-x11-fonts
 USERADD_OPTIONS   = -M
 ADD_USER_TO_GROUP = groupmod -A %(user)s %(group)s
-PACKAGE_INSTALL   = zypper -n refresh ; zypper -n install
+PACKAGE_INSTALL   = zypper -n refresh ; zypper -n install -n
 ACTIVATE_INITSCRIPT = chkconfig --add %s
 APACHE_CONF_DIR   = /etc/apache2/conf.d
 APACHE_INIT       = /etc/init.d/apache2


From git at mathias-kettner.de  Sun Jul 15 15:32:39 2012
From: git at mathias-kettner.de (git version control)
Date: Sun, 15 Jul 2012 15:32:39 +0200
Subject: [omd-commits] OMD Git: omd: check_multi: updated to 0.26_538
Message-ID: <20120715133239.8BC3A841251@mail.mathias-kettner.de>

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

Author:   Matthias Flacke <matthias.flacke at gmx.de>
Date:     Sun Jul 15 15:31:48 2012 +0200
Commiter: Matthias Flacke <matthias.flacke at gmx.de>
Date:     Sun Jul 15 15:31:48 2012 +0200

check_multi: updated to 0.26_538

---

 Changelog                                          |    1 +
 packages/check_multi/Makefile                      |    9 ++++++++-
 .../check_multi/check_multi-latest-0110cb1.tar.gz  |  Bin 0 -> 134506 bytes
 .../check_multi/check_multi-latest-6b22e5f.tar.gz  |  Bin 129304 -> 0 bytes
 4 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index dd9e616..61b1010 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ This file documents the revision history for the Open Monitoring Distribution
               for retry/accept/abort now)
           - RPMS: Not checking for removed version during pkg release update
                  (Does not mean omd version update.)
+          - check_multi: updated to 0.26_538
           - Mod-Gearman: Updated to version 1.3.4
           - Thruk: Update to 1.34
           - Nagios Plugins: Update to 1.4.16
diff --git a/packages/check_multi/Makefile b/packages/check_multi/Makefile
index b5a30bd..3ad1f96 100644
--- a/packages/check_multi/Makefile
+++ b/packages/check_multi/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME     = check_multi
-VERSION  = 6b22e5f
+VERSION  = 0110cb1
 SRCDIR   = $(NAME)-$(VERSION)
 ROOTDIR  = \\\$$ENV{OMD_ROOT}
 SITE     = \\\$$ENV{OMD_SITE}
@@ -37,6 +37,7 @@ CONFIGUREOPTS = \
 	--with-feed_passive_dir_permissions=0750 \
 	--with-findbin=1 \
 	--with-file_extension="cmd" \
+	--with-html_ascii_notification=0 \
 	--with-ignore_missing_cmd_file=0 \
 	--with-illegal_chars="\r" \
 	--with-image_path="/$(SITE)/nagios/images" \
@@ -53,18 +54,24 @@ CONFIGUREOPTS = \
 	--with-objects_cache_delimiter="," \
 	--with-omd_environment=1 \
 	--with-parent_timeout=60 \
+	--with-perfdata_pass_through=0 \
 	--with-persistent=0 \
 	--with-plugin_path="$(ROOTDIR)/lib/nagios/plugins" \
+	--with-pnp_add2url="" \
 	--with-pnp_url="/$(SITE)/pnp4nagios" \
 	--with-pnp_version=0.6 \
 	--with-report=13 \
+	--with-report_inherit_mask=-1 \
 	--with-signal_rc=3 \
 	--with-snmp_community="public" \
 	--with-snmp_port=161 \
 	--with-status_dat="$(ROOTDIR)/tmp/nagios/status.dat" \
 	--with-style_plus_minus="" \
 	--with-tag_notes_link="" \
+	--with-target="_self" \
 	--with-tmp_dir="$(ROOTDIR)/tmp/check_multi" \
+	--with-tmp_dir_permissions=01777 \
+	--with-tmp_etc="$(ROOTDIR)/tmp/check_multi/etc" \
 
 build:
 	tar xzf $(NAME)-latest-$(VERSION).tar.gz
diff --git a/packages/check_multi/check_multi-latest-0110cb1.tar.gz b/packages/check_multi/check_multi-latest-0110cb1.tar.gz
new file mode 100644
index 0000000..2e70c02
Binary files /dev/null and b/packages/check_multi/check_multi-latest-0110cb1.tar.gz differ
diff --git a/packages/check_multi/check_multi-latest-6b22e5f.tar.gz b/packages/check_multi/check_multi-latest-6b22e5f.tar.gz
deleted file mode 100644
index e1f6bd0..0000000
Binary files a/packages/check_multi/check_multi-latest-6b22e5f.tar.gz and /dev/null differ


From git at mathias-kettner.de  Mon Jul 16 08:38:21 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 16 Jul 2012 08:38:21 +0200
Subject: [omd-commits] OMD Git: omd: Tests: distro test ignore CONFIG_SITE
Message-ID: <20120716063822.269F2842F09@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Mon Jul 16 08:37:22 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Mon Jul 16 08:37:22 2012 +0200

Tests: distro test ignore CONFIG_SITE

---

 t/03-distro-makefiles.t |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/t/03-distro-makefiles.t b/t/03-distro-makefiles.t
index 2a61dfc..e36fff8 100644
--- a/t/03-distro-makefiles.t
+++ b/t/03-distro-makefiles.t
@@ -29,6 +29,7 @@ for my $file (glob("distros/Makefile.*")) {
 for my $file (keys %{$all_confs}) {
     for my $key (keys %{$all_keys}) {
         next if $key eq 'ARCH'; # arch is debian specific
+        next if $key eq 'CONFIG_SITE'; # CONFIG_SITE is OpenSuSE specific
         ok(exists($all_confs->{$file}->{$key}), "$file: $key");
     }
 }


From git at mathias-kettner.de  Mon Jul 16 08:38:21 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 16 Jul 2012 08:38:21 +0200
Subject: [omd-commits] OMD Git: omd: OpenSuSE 12.1: changed package deps
	refs:#280
Message-ID: <20120716063822.399D4842312@mail.mathias-kettner.de>

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

Author:   Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Mon Jul 16 07:43:24 2012 +0200
Commiter: Joerg Linge <pitchfork at pnp4nagios.org>
Date:     Mon Jul 16 07:43:24 2012 +0200

OpenSuSE 12.1: changed package deps refs:#280

---

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

diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1
index 42d305f..ac70830 100644
--- a/distros/Makefile.OPENSUSE_12.1
+++ b/distros/Makefile.OPENSUSE_12.1
@@ -38,9 +38,9 @@ OS_PACKAGES    += curl
 OS_PACKAGES    += dialog
 OS_PACKAGES    += fping
 OS_PACKAGES    += graphviz
-OS_PACKAGES    += libboost_program_options1_36_0
+OS_PACKAGES    += libboost_program_options1_46_1
 OS_PACKAGES    += libpng12-0
-OS_PACKAGES    += libevent-1_4-2
+OS_PACKAGES    += libevent-2_0-5
 OS_PACKAGES    += libltdl7
 OS_PACKAGES    += libreadline5
 OS_PACKAGES    += libuuid1


From git at mathias-kettner.de  Mon Jul 16 23:42:57 2012
From: git at mathias-kettner.de (git version control)
Date: Mon, 16 Jul 2012 23:42:57 +0200
Subject: [omd-commits] OMD Git: omd: Mod-Gearman: Updated to version 1.3.6
Message-ID: <20120716214257.445F6842F09@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at consol.de>
Date:     Mon Jul 16 22:54:56 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Mon Jul 16 22:54:56 2012 +0200

Mod-Gearman: Updated to version 1.3.6

---

 Changelog                                     |    2 +-
 packages/mod-gearman/Makefile                 |    2 +-
 packages/mod-gearman/mod_gearman-1.3.4.tar.gz |  Bin 309775 -> 0 bytes
 packages/mod-gearman/mod_gearman-1.3.6.tar.gz |  Bin 0 -> 313624 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 61b1010..be60871 100644
--- a/Changelog
+++ b/Changelog
@@ -9,7 +9,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - RPMS: Not checking for removed version during pkg release update
                  (Does not mean omd version update.)
           - check_multi: updated to 0.26_538
-          - Mod-Gearman: Updated to version 1.3.4
+          - Mod-Gearman: Updated to version 1.3.6
           - Thruk: Update to 1.34
           - Nagios Plugins: Update to 1.4.16
           - PNP4Nagios: Update to 0.6.18
diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index f99bf04..71db742 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = mod_gearman
-VERSION  = 1.3.4
+VERSION  = 1.3.6
 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }')
 DIR      = mod_gearman-$(VERSION)
 
diff --git a/packages/mod-gearman/mod_gearman-1.3.4.tar.gz b/packages/mod-gearman/mod_gearman-1.3.4.tar.gz
deleted file mode 100644
index a502ad4..0000000
Binary files a/packages/mod-gearman/mod_gearman-1.3.4.tar.gz and /dev/null differ
diff --git a/packages/mod-gearman/mod_gearman-1.3.6.tar.gz b/packages/mod-gearman/mod_gearman-1.3.6.tar.gz
new file mode 100644
index 0000000..8c4602e
Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.3.6.tar.gz differ


From git at mathias-kettner.de  Tue Jul 17 13:30:45 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 17 Jul 2012 13:30:45 +0200
Subject: [omd-commits] OMD Git: omd: perl: fixed cpan tests
Message-ID: <20120717113046.0BCE5842312@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at consol.de>
Date:     Tue Jul 17 10:57:20 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Tue Jul 17 12:36:04 2012 +0200

perl: fixed cpan tests

---

 packages/perl-modules/Makefile |    2 +-
 t/20-package_perl-modules.t    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile
index 4fd13b9..3e1b31b 100644
--- a/packages/perl-modules/Makefile
+++ b/packages/perl-modules/Makefile
@@ -356,7 +356,7 @@ install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/perl5 $(DESTDIR)$(OMD_ROOT)/bin
 	rsync -a $(P5TMPDIST)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/local/lib/perl5
-	cp bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper
+	install -m 755 bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper
 
 skel:
 	echo "install  --install_base  ###ROOT###/local/lib/perl5" > $(SKEL)/.modulebuildrc
diff --git a/t/20-package_perl-modules.t b/t/20-package_perl-modules.t
index 292cb8a..e5a11fa 100644
--- a/t/20-package_perl-modules.t
+++ b/t/20-package_perl-modules.t
@@ -21,7 +21,8 @@ my $site    = TestUtils::create_test_site() or TestUtils::bail_out_clean("no fur
 ##################################################
 # execute some checks
 my $tests = [
-  { cmd => "/bin/su - $site -c '/usr/bin/env cpan'", stdin => "yes\n", like => '/cpan\[1\]>/' },
+  { cmd => "/bin/su - $site -c '/usr/bin/env cpan.wrapper'", stdin => "yes\n", like => '/cpan\[1\]>/' },
+  { cmd => "/bin/su - $site -c '/usr/bin/env cpan'",         stdin => "yes\n", like => '/cpan\[1\]>/' },
 ];
 for my $test (@{$tests}) {
     TestUtils::test_command($test);


From git at mathias-kettner.de  Thu Jul 19 14:46:49 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 19 Jul 2012 14:46:49 +0200
Subject: [omd-commits] OMD Git: omd: gearman: fixed logfile path
Message-ID: <20120719124649.9EC52842286@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Thu Jul 19 14:35:05 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Thu Jul 19 14:35:05 2012 +0200

gearman: fixed logfile path

---

 packages/gearmand/Makefile    |    2 ++
 packages/mod-gearman/Makefile |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/packages/gearmand/Makefile b/packages/gearmand/Makefile
index 3072ca9..f5034cb 100644
--- a/packages/gearmand/Makefile
+++ b/packages/gearmand/Makefile
@@ -32,6 +32,8 @@ install:
 	$(MAKE) DESTDIR=$(DESTDIR) -C $(DIR) install
 
 skel:
+	mkdir -p $(SKEL)/var/log/gearman
+	touch $(SKEL)/var/log/gearman/gearman.log
 
 clean:
 	rm -rf $(DIR)
diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index 71db742..d4154f6 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -45,8 +45,10 @@ skel:
 	    ( cd $(SKEL) ; patch -p1 ) < $$p || exit 1; \
 	done
 	find $(SKEL)/etc/mod-gearman -name \*.orig -exec rm {} \;
-	mkdir -p $(SKEL)/var
+	mkdir -p $(SKEL)/var/log/mod_gearman
 	cd $(SKEL)/var/log && ln -s gearman mod_gearman
+	touch $(SKEL)/var/log/mod_gearman/neb.log
+	touch $(SKEL)/var/log/mod_gearman/worker.log
 
 
 


From git at mathias-kettner.de  Thu Jul 19 22:31:07 2012
From: git at mathias-kettner.de (git version control)
Date: Thu, 19 Jul 2012 22:31:07 +0200
Subject: [omd-commits] OMD Git: omd: thruk: update 1.36
Message-ID: <20120719203107.EB850841E98@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at consol.de>
Date:     Thu Jul 19 15:33:56 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Thu Jul 19 19:10:36 2012 +0200

thruk: update 1.36

---

 Changelog                                          |    2 +-
 packages/thruk/Makefile                            |    2 +-
 packages/thruk/Thruk-1.34.tar.gz                   |  Bin 3834591 -> 0 bytes
 packages/thruk/Thruk-1.36.tar.gz                   |  Bin 0 -> 5255571 bytes
 .../thruk/patches/0001-skel_adjustments.skel_patch |   29 +++++++++-----------
 t/20-package_thruk.t                               |    6 ++--
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/Changelog b/Changelog
index be60871..81fda89 100644
--- a/Changelog
+++ b/Changelog
@@ -10,7 +10,7 @@ This file documents the revision history for the Open Monitoring Distribution
                  (Does not mean omd version update.)
           - check_multi: updated to 0.26_538
           - Mod-Gearman: Updated to version 1.3.6
-          - Thruk: Update to 1.34
+          - Thruk: Update to 1.36
           - Nagios Plugins: Update to 1.4.16
           - PNP4Nagios: Update to 0.6.18
           - Icinga: Update to 1.7.1
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index 4fb26d6..87ccff2 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 1.34
+VERSION  = 1.36
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
diff --git a/packages/thruk/Thruk-1.34.tar.gz b/packages/thruk/Thruk-1.34.tar.gz
deleted file mode 100644
index 490ed8e..0000000
Binary files a/packages/thruk/Thruk-1.34.tar.gz and /dev/null differ
diff --git a/packages/thruk/Thruk-1.36.tar.gz b/packages/thruk/Thruk-1.36.tar.gz
new file mode 100644
index 0000000..e5e4c75
Binary files /dev/null and b/packages/thruk/Thruk-1.36.tar.gz differ
diff --git a/packages/thruk/patches/0001-skel_adjustments.skel_patch b/packages/thruk/patches/0001-skel_adjustments.skel_patch
index f2b75cd..f0230d6 100644
--- a/packages/thruk/patches/0001-skel_adjustments.skel_patch
+++ b/packages/thruk/patches/0001-skel_adjustments.skel_patch
@@ -1,6 +1,6 @@
---- a/etc/thruk/thruk.conf	2012-06-02 18:32:32.000000000 +0200
-+++ b/etc/thruk/thruk.conf	2012-06-03 00:14:10.065082960 +0200
-@@ -12,7 +12,7 @@
+--- a/etc/thruk/thruk.conf	2012-07-19 13:13:20.000000000 +0200
++++ b/etc/thruk/thruk.conf	2012-07-19 16:03:03.639789375 +0200
+@@ -13,7 +13,7 @@
  
  ######################################
  # set the url prefix for all urls
@@ -9,7 +9,7 @@
  
  ######################################
  # Changes the path to your logo images. Default is
-@@ -22,13 +22,13 @@
+@@ -23,13 +23,13 @@
  # Like usual, paths starting with a / will be absolute from your
  # webserver root directory. Paths starting without a / will be relative
  # to the cgi directory.
@@ -25,7 +25,7 @@
  
  ######################################
  # change path to your host / service action icons. You may use relative paths
-@@ -62,11 +62,11 @@
+@@ -63,11 +63,11 @@
  
  ######################################
  # location of your cgi.cfg
@@ -39,7 +39,7 @@
  
  ######################################
  # normally passive checks would be marked as disabled.
-@@ -133,35 +133,35 @@
+@@ -134,35 +134,35 @@
  
  ######################################
  # temporary directory, used for template cache...
@@ -82,7 +82,7 @@
  
  ######################################
  # use paged data instead of all data in one huge page
-@@ -221,7 +221,7 @@
+@@ -222,7 +222,7 @@
  # Instead of using a general resource_file, you could define one file
  # per peer in your peer config.
  #
@@ -91,7 +91,7 @@
  
  # show inline pnp graph if available
  # if a service or host has a pnp4nagios action url set
-@@ -292,6 +292,7 @@
+@@ -294,6 +294,7 @@
  # check should be rescheduled instead of the passive check.
  # Have a look at the documentation for a detailed description.
  #command_reschedule_alias = servicename_or_commandname_pattern;agent_service_name
@@ -99,7 +99,7 @@
  
  ######################################
  # Time Format Settings
-@@ -341,23 +342,23 @@
+@@ -343,23 +344,23 @@
  # Specifiy a file which is then completly under the control of Thruk.
  # It will be used to store cronjobs, ex. for reports. The file has to
  # be writable by Thruk.
@@ -128,7 +128,7 @@
  
  # execute regular scheduled reports with this nice level
  #report_nice_level = 5
-@@ -389,42 +390,19 @@
+@@ -401,42 +402,19 @@
  ######################################
  # Backend Configuration, enter your backends here
  <Component Thruk::Backend>
@@ -184,7 +184,7 @@
  </Component>
  
  
-@@ -438,7 +416,12 @@
+@@ -450,9 +428,9 @@
  <Component Thruk::Plugin::ConfigTool>
      show_plugin_syntax_helper = 1
  
@@ -195,8 +195,5 @@
 +    cgi.cfg  = ###ROOT###/etc/nagios/cgi.cfg
 +    htpasswd = ###ROOT###/etc/htpasswd
  </Component>
-+
-+######################################
-+# OMD Settings
-+# username used when cli tool used without -A
-+default_cli_user_name=omdadmin
+ 
+ ######################################
diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t
index b0a7eb7..5789dcd 100644
--- a/t/20-package_thruk.t
+++ b/t/20-package_thruk.t
@@ -78,23 +78,23 @@ for my $report (@{$reports}) {
         }
     }
     push @{$tests}, (
-      { cmd => "/bin/su - $site -c './bin/thruk \"/thruk/cgi-bin/reports.cgi?action=save&report=9999&".join('&', @{$args})."\"'",
+      { cmd => "/bin/su - $site -c './bin/thruk -A omdadmin \"/thruk/cgi-bin/reports.cgi?action=save&report=9999&".join('&', @{$args})."\"'",
                like => "/OK - report updated/" },
       { cmd => "/bin/su - $site -c 'omd reload crontab'", like => [ '/OK/' ] },
       { cmd => "/bin/su - $site -c '/usr/bin/crontab -l | grep -i thruk | grep -v cron.d'", like => [ '/9999/' ] },
       { cmd => "/bin/su - $site -c './bin/thruk -a report=9999 --local'", like => [ '/%PDF\-1\.4/', '/%%EOF/' ] },
-      { cmd => "/bin/su - $site -c './bin/thruk \"/thruk/cgi-bin/reports.cgi?action=remove&report=9999\"'", like => '/OK - report removed/' },
+      { cmd => "/bin/su - $site -c './bin/thruk -A omdadmin \"/thruk/cgi-bin/reports.cgi?action=remove&report=9999\"'", like => '/OK - report removed/' },
     );
 }
 
 
 my $urls = [
 # static html pages
+  { url => "/thruk/side.html",       like => '/<title>Thruk<\/title>/' },
   { url => "",                       like => '/<title>Thruk<\/title>/' },
   { url => "/thruk/index.html",      like => '/<title>Thruk<\/title>/' },
   { url => "/thruk/docs/index.html", like => '/<title>Documentation<\/title>/' },
   { url => "/thruk/main.html",       like => '/<title>Thruk Monitoring Webinterface<\/title>/' },
-  { url => "/thruk/side.html",       like => '/<title>Thruk<\/title>/' },
 
 # availability
   { url => '/thruk/cgi-bin/avail.cgi', 'like' => '/Availability Report/' },


From git at mathias-kettner.de  Sat Jul 21 11:10:33 2012
From: git at mathias-kettner.de (git version control)
Date: Sat, 21 Jul 2012 11:10:33 +0200
Subject: [omd-commits] OMD Git: omd: mod-gearman: removed useless link
	(fixes #283)
Message-ID: <20120721091034.3304D841106@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Sat Jul 21 11:09:43 2012 +0200
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Sat Jul 21 11:10:18 2012 +0200

mod-gearman: removed useless link (fixes #283)

---

 .../mod-gearman/skel/etc/init.d/gearman_worker     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/packages/mod-gearman/skel/etc/init.d/gearman_worker b/packages/mod-gearman/skel/etc/init.d/gearman_worker
index 8b36461..350cb49 100644
--- a/packages/mod-gearman/skel/etc/init.d/gearman_worker
+++ b/packages/mod-gearman/skel/etc/init.d/gearman_worker
@@ -37,7 +37,7 @@ case "$1" in
         echo -n "Starting $NAME..."
         mkdir -p ###ROOT###/tmp/run
         mkdir -p ###ROOT###/var/log/gearman
-        cd ###ROOT###/var/log && ln -s gearman mod-gearman 2>/dev/null
+        rm -f ###ROOT###/var/log/mod-gearman/gearman
         CMD="$DAEMON -d --config=$CONFIG --pidfile=$PIDFILE"
         if [ "$USERID" -eq 0 ]; then
             su -s $SHELL - $USER -c  "$CMD"


From git at mathias-kettner.de  Fri Jul 27 11:26:52 2012
From: git at mathias-kettner.de (git version control)
Date: Fri, 27 Jul 2012 11:26:52 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
 ssh://mathias-kettner.de/omd
Message-ID: <20120727092652.E6583842F71@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Jul 27 11:26:51 2012 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Jul 27 11:26:51 2012 +0200

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

---




From git at mathias-kettner.de  Fri Jul 27 11:26:52 2012
From: git at mathias-kettner.de (git version control)
Date: Fri, 27 Jul 2012 11:26:52 +0200
Subject: [omd-commits] OMD Git: omd: set log_initial_states=1 per default
Message-ID: <20120727092653.135118412B3@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Jul 27 11:26:27 2012 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Fri Jul 27 11:26:27 2012 +0200

set log_initial_states=1 per default

---

 Changelog                                          |    1 +
 .../nagios/skel/etc/nagios/nagios.d/logging.cfg    |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 142a5e8..0def86b 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Icinga: Update to 1.7.1
           - Check_MK: Added 1.2.0p1 release
           - Support Ubuntu 12.04 (Precise)
+          - set log_initial_states=1 per default
 
 0.54     Apr 02 2012
           - omd:
diff --git a/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg b/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg
index cbbe3e3..4e98868 100644
--- a/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg
+++ b/packages/nagios/skel/etc/nagios/nagios.d/logging.cfg
@@ -56,7 +56,7 @@ log_event_handlers=1
 # statistics reporting, you do not need to enable this option.  In
 # this case, set the value to 0.
 
-log_initial_states=0
+log_initial_states=1
 
 # EXTERNAL COMMANDS LOGGING OPTION
 # If you don't want Nagios to log external commands, set this value


From git at mathias-kettner.de  Sat Jul 28 16:06:43 2012
From: git at mathias-kettner.de (git version control)
Date: Sat, 28 Jul 2012 16:06:43 +0200
Subject: [omd-commits] OMD Git: omd: Thruk: update 1.38
Message-ID: <20120728140644.30DA1841BCF@mail.mathias-kettner.de>

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

Author:   Sven Nierlein <sven at consol.de>
Date:     Fri Jul 27 20:35:30 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Sat Jul 28 16:06:10 2012 +0200

Thruk: update 1.38

---

 Changelog                        |    2 +-
 packages/thruk/Makefile          |    2 +-
 packages/thruk/Thruk-1.36.tar.gz |  Bin 5255571 -> 0 bytes
 packages/thruk/Thruk-1.38.tar.gz |  Bin 0 -> 5279998 bytes
 4 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index f1c71f8..de8123a 100644
--- a/Changelog
+++ b/Changelog
@@ -10,7 +10,7 @@ This file documents the revision history for the Open Monitoring Distribution
                  (Does not mean omd version update.)
           - check_multi: updated to 0.26_538
           - Mod-Gearman: Updated to version 1.3.6
-          - Thruk: Update to 1.36
+          - Thruk: Update to 1.38
           - Nagios Plugins: Update to 1.4.16
           - PNP4Nagios: Update to 0.6.18
           - Icinga: Update to 1.7.1
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index 87ccff2..c05a5c2 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 1.36
+VERSION  = 1.38
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
diff --git a/packages/thruk/Thruk-1.36.tar.gz b/packages/thruk/Thruk-1.36.tar.gz
deleted file mode 100644
index e5e4c75..0000000
Binary files a/packages/thruk/Thruk-1.36.tar.gz and /dev/null differ
diff --git a/packages/thruk/Thruk-1.38.tar.gz b/packages/thruk/Thruk-1.38.tar.gz
new file mode 100644
index 0000000..68aac59
Binary files /dev/null and b/packages/thruk/Thruk-1.38.tar.gz differ


From git at mathias-kettner.de  Tue Jul 31 17:37:01 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 31 Jul 2012 17:37:01 +0200
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
 ssh://mathias-kettner.de/omd
Message-ID: <20120731153701.4E107841429@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Jul 31 17:36:59 2012 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Jul 31 17:36:59 2012 +0200

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

---




From git at mathias-kettner.de  Tue Jul 31 17:37:01 2012
From: git at mathias-kettner.de (git version control)
Date: Tue, 31 Jul 2012 17:37:01 +0200
Subject: [omd-commits] OMD Git: omd: Added Makefile for CentOS 6.3
Message-ID: <20120731153701.633AC8412DA@mail.mathias-kettner.de>

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

Author:   Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Jul 31 17:36:45 2012 +0200
Commiter: Mathias Kettner <mk at mathias-kettner.de>
Date:     Tue Jul 31 17:36:45 2012 +0200

Added Makefile for CentOS 6.3

---

 distros/Makefile.CENTOS_6.3 |   80 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 80 insertions(+), 0 deletions(-)

diff --git a/distros/Makefile.CENTOS_6.3 b/distros/Makefile.CENTOS_6.3
new file mode 100644
index 0000000..3a8c21e
--- /dev/null
+++ b/distros/Makefile.CENTOS_6.3
@@ -0,0 +1,80 @@
+DISTRO_CODE       = rh62
+BUILD_PACKAGES    =
+BUILD_PACKAGES   += boost-devel
+BUILD_PACKAGES   += cairo-devel
+BUILD_PACKAGES   += expat-devel
+BUILD_PACKAGES   += fping
+BUILD_PACKAGES   += gcc
+BUILD_PACKAGES   += gcc-c++
+BUILD_PACKAGES   += libevent-devel         # RHEL Server Optional
+BUILD_PACKAGES   += libtool-ltdl-devel     # RHEL Server Optional 
+BUILD_PACKAGES   += libtool-ltdl           # needed by libtool-ltdl-devel
+BUILD_PACKAGES   += gd-devel               # RHEL Server Optional
+BUILD_PACKAGES   += libXpm-devel           # needed by gd-devel
+BUILD_PACKAGES   += libjpeg-devel          # needed by gd-devel
+BUILD_PACKAGES   += httpd-devel
+BUILD_PACKAGES   += libmcrypt-devel        # LM: Taken from http://pkgs.repoforge.org/libmcrypt/
+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   += compat-readline5
+BUILD_PACKAGES   += rpm-build
+BUILD_PACKAGES   += samba-client
+BUILD_PACKAGES   += libuuid-devel
+BUILD_PACKAGES   += which
+BUILD_PACKAGES   += perl-devel
+BUILD_PACKAGES   += perl-ExtUtils-Embed
+BUILD_PACKAGES   += perl-Time-HiRes
+BUILD_PACKAGES   += rsync
+BUILD_PACKAGES   += groff                  # Is needed by rrdtool docs
+OS_PACKAGES       =
+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      += 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      += httpd
+OS_PACKAGES      += libevent
+OS_PACKAGES      += libmcrypt             # LM: Taken from http://pkgs.repoforge.org/libmcrypt/
+OS_PACKAGES      += libtool-ltdl
+OS_PACKAGES      += mod_fcgid             # LM: Taken from http://dl.fedoraproject.org/pub/epel/6/x86_64/
+OS_PACKAGES      += mysql-server
+OS_PACKAGES      += net-snmp
+OS_PACKAGES      += net-snmp-utils
+OS_PACKAGES      += pango
+OS_PACKAGES      += patch
+OS_PACKAGES      += perl-Net-SNMP         # LM: Taken from http://dl.fedoraproject.org/pub/epel/6/x86_64/
+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     =