[omd-commits] OMD Git: omd: pnp4nagios: update to 0.6.10

git version control git at mathias-kettner.de
Wed Dec 15 20:54:20 CET 2010


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

Author: Joerg Linge <pitchfork at pnp4nagios.org>
Date:   Wed Dec 15 20:51:43 2010 +0100

pnp4nagios: update to 0.6.10

---

 packages/pnp4nagios/.gitignore                     |    2 +-
 packages/pnp4nagios/Makefile                       |   10 +++---
 packages/pnp4nagios/patches/0001-omd-path.dif      |   32 --------------------
 packages/pnp4nagios/pnp4nagios-0.6.10.tar.gz       |  Bin 0 -> 1950872 bytes
 packages/pnp4nagios/pnp4nagios-0.6.7.tar.gz        |  Bin 1874012 -> 0 bytes
 packages/pnp4nagios/skel/etc/pnp4nagios/config.php |   19 ++++++++++++
 6 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/packages/pnp4nagios/.gitignore b/packages/pnp4nagios/.gitignore
index f7570f2..46ecc18 100644
--- a/packages/pnp4nagios/.gitignore
+++ b/packages/pnp4nagios/.gitignore
@@ -1,2 +1,2 @@
-pnp4nagios-0.?.?
+pnp4nagios-0.6.10
 pnp4nagios-head
diff --git a/packages/pnp4nagios/Makefile b/packages/pnp4nagios/Makefile
index 23320f7..f06553c 100644
--- a/packages/pnp4nagios/Makefile
+++ b/packages/pnp4nagios/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.omd
 .PHONY: skel
 
 NAME = pnp4nagios
-VERSION = 0.6.7
+VERSION = 0.6.10
 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/patches/0001-omd-path.dif b/packages/pnp4nagios/patches/0001-omd-path.dif
deleted file mode 100644
index e5ade61..0000000
--- a/packages/pnp4nagios/patches/0001-omd-path.dif
+++ /dev/null
@@ -1,32 +0,0 @@
-git diff
-diff --git a/share/pnp/index.php.in b/share/pnp/index.php.in
-index b5df0a9..44e2245 100644
---- a/share/pnp/index.php.in
-+++ b/share/pnp/index.php.in
-@@ -27,19 +27,17 @@ define('IN_PRODUCTION', TRUE);
-  * OMD path detection
-  *
-  */
--if(preg_match ("/^\/opt\/omd\//", __FILE__)){
--    $parts = preg_split('/\//', __FILE__ );
-+if(substr($_SERVER["SCRIPT_FILENAME"], 0, 4) == '/omd') {
-     define('OMD', TRUE);
--    define('OMD_VERSION', $parts[4]);
--    define('OMD_ROOT', sprintf('/%s/%s/%s/%s', $parts[1],$parts[2],$parts[3],$parts[4]));
--    $parts = preg_split('/\//', $_SERVER['REQUEST_URI'] );
--    define('OMD_SITE', $parts[1]);
--    define('OMD_SITE_ROOT', '/opt/omd/sites/'.$parts[1]);
--    unset($parts);
-+    $site_parts = array_slice(explode('/' ,dirname($_SERVER["SCRIPT_FILENAME"])), 0, -3);
-+    define('OMD_SITE_ROOT', join($site_parts, '/'));
-+    define('OMD_SITE', $site_parts[count($site_parts)-1]);
-+    unset($site_parts);
- }else{
-     define('OMD', FALSE);
- }
- 
-+
- /**
-  *
-  * Autodetect base URL
-
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.10.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.10.tar.gz
new file mode 100644
index 0000000..f95c734
Binary files /dev/null and b/packages/pnp4nagios/pnp4nagios-0.6.10.tar.gz differ
diff --git a/packages/pnp4nagios/pnp4nagios-0.6.7.tar.gz b/packages/pnp4nagios/pnp4nagios-0.6.7.tar.gz
deleted file mode 100644
index a5189df..0000000
Binary files a/packages/pnp4nagios/pnp4nagios-0.6.7.tar.gz and /dev/null differ
diff --git a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
index 01431a3..243376d 100644
--- a/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
+++ b/packages/pnp4nagios/skel/etc/pnp4nagios/config.php
@@ -85,6 +85,25 @@ $conf['multisite_base_url'] = "/###SITE###/check_mk";
 #
 $conf['multisite_site'] = "###SITE###";
 
+#
+# check authorization against mk_livestatus API 
+# Available since 0.6.10
+#
+$conf['auth_enabled'] = FALSE;
+
+#
+# Livestatus socket path
+# 
+$conf['livestatus_socket'] = "unix:###ROOT###/tmp/run/live";
+
+#
+# Which user is allowed to see all services or all hosts?
+# Keywords: <USERNAME>
+# Example: conf['allowed_for_all_services'] = "nagiosadmin,operator";
+# This option is used while $conf['auth_enabled'] = TRUE
+$conf['allowed_for_all_services'] = "omdadmin";
+$conf['allowed_for_all_hosts'] = "omdadmin";
+
 # Which user is allowed to see additional service links ?
 # Keywords: EVERYONE NONE <USERNAME>
 # Example: conf['allowed_for_service_links'] = "nagiosadmin,operator";



More information about the omd-commits mailing list