[omd-commits] OMD Git: omd: thruk: update to 1.1.5

git version control git at mathias-kettner.de
Sat Dec 3 00:47:19 CET 2011


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

Author:   Sven Nierlein <sven at nierlein.de>
Date:     Sat Dec  3 00:46:44 2011 +0100
Commiter: Sven Nierlein <sven at nierlein.de>
Date:     Sat Dec  3 00:46:44 2011 +0100

thruk: update to 1.1.5

---

 Changelog                                          |    2 +-
 packages/thruk/Makefile                            |    2 +-
 packages/thruk/Thruk-1.1.4-src.tar.gz              |  Bin 3098200 -> 0 bytes
 packages/thruk/Thruk-1.1.5-src.tar.gz              |  Bin 0 -> 3099103 bytes
 .../thruk/patches/0001-skel_adjustments.skel_patch |   22 +++++++++++--------
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Changelog b/Changelog
index 250ac52..54c33e2 100644
--- a/Changelog
+++ b/Changelog
@@ -43,7 +43,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - pnp4nagios
             - npcd: Now detecting and handling stale pidfiles in init script
           - updated to Mod-Gearman 1.1.1
-          - updated to Thruk 1.1.4
+          - updated to Thruk 1.1.5
           - updated to pnp4nagios 0.6.16
           - updated to Icinga 1.6.1
           - Support Ubuntu 11.10 (Oneiric)
diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile
index 5d96823..398f40a 100644
--- a/packages/thruk/Makefile
+++ b/packages/thruk/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = Thruk
-VERSION  = 1.1.4
+VERSION  = 1.1.5
 DIR      = $(NAME)-$(VERSION)
 PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}')
 
diff --git a/packages/thruk/Thruk-1.1.4-src.tar.gz b/packages/thruk/Thruk-1.1.4-src.tar.gz
deleted file mode 100644
index 9bf7e3d..0000000
Binary files a/packages/thruk/Thruk-1.1.4-src.tar.gz and /dev/null differ
diff --git a/packages/thruk/Thruk-1.1.5-src.tar.gz b/packages/thruk/Thruk-1.1.5-src.tar.gz
new file mode 100644
index 0000000..613703d
Binary files /dev/null and b/packages/thruk/Thruk-1.1.5-src.tar.gz differ
diff --git a/packages/thruk/patches/0001-skel_adjustments.skel_patch b/packages/thruk/patches/0001-skel_adjustments.skel_patch
index ab30914..ef440b2 100644
--- a/packages/thruk/patches/0001-skel_adjustments.skel_patch
+++ b/packages/thruk/patches/0001-skel_adjustments.skel_patch
@@ -1,5 +1,5 @@
---- a/etc/thruk/thruk.conf	2011-11-19 17:25:51.000000000 +0100
-+++ b/etc/thruk/thruk.conf	2011-11-19 17:40:18.924957040 +0100
+--- a/etc/thruk/thruk.conf	2011-12-03 00:42:00.301709582 +0100
++++ b/etc/thruk/thruk.conf	2011-12-03 00:43:53.444300841 +0100
 @@ -12,7 +12,7 @@
  
  ######################################
@@ -82,7 +82,7 @@
  
  ######################################
  # use paged data instead of all data in one huge page
-@@ -198,7 +193,7 @@
+@@ -198,7 +198,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
-@@ -262,6 +257,7 @@
+@@ -262,6 +262,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
-@@ -328,37 +324,19 @@
+@@ -328,42 +329,19 @@
  ######################################
  # Backend Configuration, enter your backends here
  <Component Thruk::Backend>
@@ -112,6 +112,11 @@
 -#            peer          = /tmp/livestatus.socket
 -#            resource_file = path_to_your/resource.cfg
 -#       </options>
+-#       <configtool>
+-#            core_conf      = /etc/nagios/nagios.cfg
+-#            obj_check_cmd  = /etc/init.d/nagios checkconfig
+-#            obj_reload_cmd = /etc/init.d/nagios reload
+-#       </configtool>
 -#    </peer>
 -#    <peer>
 -#        name   = External Nagios
@@ -150,10 +155,10 @@
  </Component>
  
  
-@@ -370,7 +348,8 @@
- # authorized_for_configuration_information and authorized_for_system_commands
- # will then have access to the config tool.
+@@ -377,7 +355,7 @@
  <Component Thruk::Plugin::ConfigTool>
+     show_plugin_syntax_helper = 1
+ 
 -    thruk    = ./thruk_local.conf
 -    cgi.cfg  = ./cgi.cfg
 -#    htpasswd = ./htpasswd
@@ -161,4 +166,3 @@
 +    cgi.cfg  = ###ROOT###/etc/nagios/cgi.cfg
 +    htpasswd = ###ROOT###/etc/htpasswd
  </Component>
-+



More information about the omd-commits mailing list