From git at mathias-kettner.de Fri Jan 3 17:29:59 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 03 Jan 2014 17:29:59 +0100 Subject: [omd-commits] OMD Git: omd: thruk: rewritelock is not required on apache 2.4 Message-ID: <20140103162959.D4FEC82934@mail.mathias-kettner.de> Module: omd Branch: master Commit: 2707f8735038739e53f5c5d2ad37efb541da939b URL: http://omdistro.org/projects/omd/repository/revisions/2707f8735038739e53f5c5d2ad37efb541da939b Author: Sven Nierlein Date: Fri Jan 3 16:26:09 2014 +0100 Commiter: Sven Nierlein Date: Fri Jan 3 16:26:09 2014 +0100 thruk: rewritelock is not required on apache 2.4 --- packages/thruk/THRUK_COOKIE_AUTH.hook | 4 +++- t/20-package_thruk.t | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/packages/thruk/THRUK_COOKIE_AUTH.hook b/packages/thruk/THRUK_COOKIE_AUTH.hook index 84caf78..41eee4a 100755 --- a/packages/thruk/THRUK_COOKIE_AUTH.hook +++ b/packages/thruk/THRUK_COOKIE_AUTH.hook @@ -20,7 +20,9 @@ case "$1" in APACHE_CFG=${OMD_ROOT}/etc/apache/conf.d/thruk_cookie_auth.conf if [ "$2" == "on" ]; then cat > $APACHE_CFG < + RewriteLock "\${OMD_ROOT}/var/thruk/apache_rewrite.lock" + RewriteMap users prg:\${OMD_ROOT}/share/thruk/script/thruk_auth # make cookie accessible by the url diff --git a/t/20-package_thruk.t b/t/20-package_thruk.t index 12a5fff..2449177 100644 --- a/t/20-package_thruk.t +++ b/t/20-package_thruk.t @@ -13,7 +13,7 @@ BEGIN { use lib "$FindBin::Bin/lib/lib/perl5"; } -plan( tests => 2739 ); +plan( tests => 2774 ); ################################################## # create our test site @@ -186,9 +186,13 @@ my $shared_urls = [ { url => '/thruk/cgi-bin/bp.cgi?action=remove&bp=1', follow => 1, skip_link_check => ['.cgi'] }, ]; +my $cookie_urls = [ + { url => '/thruk/cgi-bin/tac.cgi', follow => 1, like => '/Password/' }, +]; + # complete the url -for my $url ( @{$urls}, @{$shared_urls}, @{$own_urls} ) { +for my $url ( @{$urls}, @{$shared_urls}, @{$own_urls}, @{$cookie_urls} ) { $url->{'url'} = "http://localhost/".$site.$url->{'url'}; $url->{'auth'} = $auth; $url->{'unlike'} = [ '/internal server error/', '/"\/thruk\//', '/\'\/thruk\//' ]; @@ -257,6 +261,21 @@ for my $core (qw/nagios shinken icinga/) { } ################################################## +# enable cookie auth +TestUtils::test_command({ cmd => $omd_bin." stop $site" }); +TestUtils::test_command({ cmd => $omd_bin." config $site set CORE nagios" }); +TestUtils::test_command({ cmd => $omd_bin." config $site set APACHE_MODE own" }); +TestUtils::test_command({ cmd => $omd_bin." config $site set THRUK_COOKIE_AUTH on" }); +TestUtils::test_command({ cmd => $omd_bin." start $site", like => '/OK/' }); +TestUtils::test_command({ cmd => TestUtils::config('APACHE_INIT')." restart" }); +TestUtils::test_command({ cmd => $omd_bin." start $site thruk", like => '/OK/' }); +sleep(3); +TestUtils::test_command({ cmd => $omd_bin." status $site apache", like => '/running/' }); +for my $url ( @{$cookie_urls} ) { + TestUtils::test_url($url); +} + +################################################## # cleanup test site TestUtils::test_command({ cmd => TestUtils::config('APACHE_INIT')." restart" }); TestUtils::remove_test_site($site); From git at mathias-kettner.de Fri Jan 3 17:29:59 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 03 Jan 2014 17:29:59 +0100 Subject: [omd-commits] OMD Git: omd: shinken: ensure process is really stopped Message-ID: <20140103162959.F046F82932@mail.mathias-kettner.de> Module: omd Branch: master Commit: c049211084fbbc06d91cc9a0f8ee633633f3db49 URL: http://omdistro.org/projects/omd/repository/revisions/c049211084fbbc06d91cc9a0f8ee633633f3db49 Author: Sven Nierlein Date: Fri Jan 3 13:40:02 2014 +0100 Commiter: Sven Nierlein Date: Fri Jan 3 15:50:58 2014 +0100 shinken: ensure process is really stopped --- packages/shinken/skel/etc/init.d/shinken | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken index 13171cf..b5a4b24 100644 --- a/packages/shinken/skel/etc/init.d/shinken +++ b/packages/shinken/skel/etc/init.d/shinken @@ -361,7 +361,7 @@ do_stop() { if [ $running -gt 0 ]; then echo "FAIL" # stop means stop - for cpid in $(ps -aefw | grep $pid | grep "shinken-" | awk '{print $2}' | sort -g -r); do + for cpid in $(ps -aefw | grep $OMD_SITE | grep "shinken-$mod" | awk '{print $2}' | sort -g -r); do kill -9 $cpid > /dev/null 2>&1 #printf "." done From git at mathias-kettner.de Fri Jan 10 11:27:40 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 10 Jan 2014 11:27:40 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140110102740.8C87D82171@mail.mathias-kettner.de> Module: omd Branch: master Commit: d631cfd0c1defb8f8afb98dad7223929ded3a35d URL: http://omdistro.org/projects/omd/repository/revisions/d631cfd0c1defb8f8afb98dad7223929ded3a35d Author: Lars Michelsen Date: Fri Jan 10 11:27:33 2014 +0100 Commiter: Lars Michelsen Date: Fri Jan 10 11:27:33 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Fri Jan 10 11:27:40 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 10 Jan 2014 11:27:40 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: added new 1.8b2 release Message-ID: <20140110102740.A777F82165@mail.mathias-kettner.de> Module: omd Branch: master Commit: c4f753289566821c345ac57774e7c94e060ae69d URL: http://omdistro.org/projects/omd/repository/revisions/c4f753289566821c345ac57774e7c94e060ae69d Author: Lars Michelsen Date: Fri Jan 10 11:27:25 2014 +0100 Commiter: Lars Michelsen Date: Fri Jan 10 11:27:25 2014 +0100 nagvis: added new 1.8b2 release --- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.8b1.tar.gz | Bin 1421899 -> 0 bytes packages/nagvis/nagvis-1.8b2.tar.gz | Bin 0 -> 1416164 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 83d298d..2eac5b3 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.8b1 +VERSION = 1.8b2 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.8b1.tar.gz b/packages/nagvis/nagvis-1.8b1.tar.gz deleted file mode 100644 index 40c4f67..0000000 Binary files a/packages/nagvis/nagvis-1.8b1.tar.gz and /dev/null differ diff --git a/packages/nagvis/nagvis-1.8b2.tar.gz b/packages/nagvis/nagvis-1.8b2.tar.gz new file mode 100644 index 0000000..e59d8e3 Binary files /dev/null and b/packages/nagvis/nagvis-1.8b2.tar.gz differ From git at mathias-kettner.de Mon Jan 13 16:41:07 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 13 Jan 2014 16:41:07 +0100 Subject: [omd-commits] OMD Git: omd: shinken: update to 1.4.1 Message-ID: <20140113154107.93B838262F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3aacac6828129fd8843c360bd77537c86f48b73f URL: http://omdistro.org/projects/omd/repository/revisions/3aacac6828129fd8843c360bd77537c86f48b73f Author: Gerhard Lausser Date: Mon Jan 13 16:40:33 2014 +0100 Commiter: Gerhard Lausser Date: Mon Jan 13 16:40:33 2014 +0100 shinken: update to 1.4.1 --- packages/shinken/Makefile | 2 +- packages/shinken/{shinken-1.4.tar.gz => shinken-1.4.1.tar.gz} | Bin 11096576 -> 11102259 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile index 5a96969..d8a97f8 100644 --- a/packages/shinken/Makefile +++ b/packages/shinken/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd -SHINKEN=shinken-1.4 +SHINKEN=shinken-1.4.1 SHINKEN_FILE=$(SHINKEN).tar.gz SHINKEN_URL=http://shinken-monitoring.org/pub/$(SHINKEN).tar.gz # diff --git a/packages/shinken/shinken-1.4.tar.gz b/packages/shinken/shinken-1.4.1.tar.gz similarity index 59% rename from packages/shinken/shinken-1.4.tar.gz rename to packages/shinken/shinken-1.4.1.tar.gz index 9ec55a2..6b6cd7a 100644 Binary files a/packages/shinken/shinken-1.4.tar.gz and b/packages/shinken/shinken-1.4.1.tar.gz differ From git at mathias-kettner.de Mon Jan 13 16:41:07 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 13 Jan 2014 16:41:07 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140113154107.AE3A08260F@mail.mathias-kettner.de> Module: omd Branch: master Commit: aeacd252ae6c615ea396e4babee90666f994f53d URL: http://omdistro.org/projects/omd/repository/revisions/aeacd252ae6c615ea396e4babee90666f994f53d Author: Gerhard Lausser Date: Mon Jan 13 16:40:57 2014 +0100 Commiter: Gerhard Lausser Date: Mon Jan 13 16:40:57 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Mon Jan 13 19:29:39 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 13 Jan 2014 19:29:39 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.3 Message-ID: <20140113182939.21C2882681@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1386092db375db54dafe5d0200e25126e8dd8a13 URL: http://omdistro.org/projects/omd/repository/revisions/1386092db375db54dafe5d0200e25126e8dd8a13 Author: Gerhard Lausser Date: Mon Jan 13 19:29:34 2014 +0100 Commiter: Gerhard Lausser Date: Mon Jan 13 19:29:34 2014 +0100 check_oracle_health: update to 1.9.3 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.2.tar.gz | Bin 160569 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz | Bin 0 -> 160561 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index e781c89..5b3f392 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_oracle_health -VERSION = 1.9.2 +VERSION = 1.9.3 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.2.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.2.tar.gz deleted file mode 100644 index e9d88b0..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.2.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz new file mode 100644 index 0000000..af0d323 Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz differ From git at mathias-kettner.de Tue Jan 14 10:50:16 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 14 Jan 2014 10:50:16 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: updated to current nightly Message-ID: <20140114095016.4F5358283F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6692e8632da8e52758e7cda6e1f7ce95736869af URL: http://omdistro.org/projects/omd/repository/revisions/6692e8632da8e52758e7cda6e1f7ce95736869af Author: Lars Michelsen Date: Tue Jan 14 10:50:12 2014 +0100 Commiter: Lars Michelsen Date: Tue Jan 14 10:50:12 2014 +0100 nagvis: updated to current nightly --- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 0 -> 1441849 bytes packages/nagvis/nagvis-1.8b2.tar.gz | Bin 1416164 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 2eac5b3..923bd57 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.8b2 +VERSION = 1.8-nightly DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz new file mode 100644 index 0000000..d27e4b3 Binary files /dev/null and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ diff --git a/packages/nagvis/nagvis-1.8b2.tar.gz b/packages/nagvis/nagvis-1.8b2.tar.gz deleted file mode 100644 index e59d8e3..0000000 Binary files a/packages/nagvis/nagvis-1.8b2.tar.gz and /dev/null differ From git at mathias-kettner.de Tue Jan 14 17:04:56 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 14 Jan 2014 17:04:56 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140114160456.75B9382448@mail.mathias-kettner.de> Module: omd Branch: master Commit: f10d184fd8762602255f66f59f88f94aba0fbf87 URL: http://omdistro.org/projects/omd/repository/revisions/f10d184fd8762602255f66f59f88f94aba0fbf87 Author: Gerhard Lausser Date: Tue Jan 14 17:04:53 2014 +0100 Commiter: Gerhard Lausser Date: Tue Jan 14 17:04:53 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue Jan 14 17:04:56 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 14 Jan 2014 17:04:56 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.3.1 Message-ID: <20140114160456.89A2982171@mail.mathias-kettner.de> Module: omd Branch: master Commit: fd5cb67305dbd5ae1b560c49648a3ad46821bccd URL: http://omdistro.org/projects/omd/repository/revisions/fd5cb67305dbd5ae1b560c49648a3ad46821bccd Author: Gerhard Lausser Date: Tue Jan 14 17:04:32 2014 +0100 Commiter: Gerhard Lausser Date: Tue Jan 14 17:04:32 2014 +0100 check_oracle_health: update to 1.9.3.1 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz | Bin 0 -> 160716 bytes packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz | Bin 160561 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 5b3f392..af04be8 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_oracle_health -VERSION = 1.9.3 +VERSION = 1.9.3.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz new file mode 100644 index 0000000..60184e8 Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz deleted file mode 100644 index af0d323..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.tar.gz and /dev/null differ From git at mathias-kettner.de Thu Jan 16 13:20:58 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 16 Jan 2014 13:20:58 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Fixed tests Message-ID: <20140116122058.B0B6F828F1@mail.mathias-kettner.de> Module: omd Branch: master Commit: e74aa236b544060180691dd67863831275f8e5c4 URL: http://omdistro.org/projects/omd/repository/revisions/e74aa236b544060180691dd67863831275f8e5c4 Author: Lars Michelsen Date: Thu Jan 16 13:20:54 2014 +0100 Commiter: Lars Michelsen Date: Thu Jan 16 13:20:54 2014 +0100 nagvis: Fixed tests --- t/20-package_nagvis.t | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/t/20-package_nagvis.t b/t/20-package_nagvis.t index 64f1e9b..8555809 100644 --- a/t/20-package_nagvis.t +++ b/t/20-package_nagvis.t @@ -12,7 +12,7 @@ BEGIN { use lib "$FindBin::Bin/lib/lib/perl5"; } -my $num_tests = 382; +my $num_tests = 375; if($ENV{NAGVIS_DEVEL}) { $num_tests += 3; } @@ -384,12 +384,6 @@ TestUtils::test_url( like => [ '/"showmaps":1,"showgeomap":0,"showmapthumbs":0,"showrotations":1/', ]}) ); -# /nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewMaps -TestUtils::test_url( - api_url_list({ url => '/nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewMaps', - like => [ '/"alias":/', ]}) -); - # /nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewRotations TestUtils::test_url( api_url_list({ url => '/nagvis/server/core/ajax_handler.php?mod=Overview&act=getOverviewRotations', From git at mathias-kettner.de Thu Jan 16 20:02:56 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 16 Jan 2014 20:02:56 +0100 Subject: [omd-commits] OMD Git: omd: thruk: source .thruk if it exists Message-ID: <20140116190256.97B27829C6@mail.mathias-kettner.de> Module: omd Branch: master Commit: e59939fedab4e51be8b19d55914ac57710996d34 URL: http://omdistro.org/projects/omd/repository/revisions/e59939fedab4e51be8b19d55914ac57710996d34 Author: Sven Nierlein Date: Thu Jan 16 16:27:32 2014 +0100 Commiter: Sven Nierlein Date: Thu Jan 16 20:02:47 2014 +0100 thruk: source .thruk if it exists --- packages/thruk/skel/etc/thruk/fcgid_env.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/thruk/skel/etc/thruk/fcgid_env.sh b/packages/thruk/skel/etc/thruk/fcgid_env.sh index 57c62d7..fe8c58e 100644 --- a/packages/thruk/skel/etc/thruk/fcgid_env.sh +++ b/packages/thruk/skel/etc/thruk/fcgid_env.sh @@ -1,6 +1,7 @@ #!/bin/bash -. "###ROOT###/.profile" +[ -e ###ROOT###/.profile ] && . ###ROOT###/.profile +[ -e ###ROOT###/.thruk ] && . ###ROOT###/.thruk # set omd environment export CATALYST_CONFIG="###ROOT###/etc/thruk" From git at mathias-kettner.de Thu Jan 23 10:57:22 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 23 Jan 2014 10:57:22 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: new build Message-ID: <20140123095722.0EDFA828E4@mail.mathias-kettner.de> Module: omd Branch: master Commit: ca56ff92c25d597666192ff1541124878a7a8dd1 URL: http://omdistro.org/projects/omd/repository/revisions/ca56ff92c25d597666192ff1541124878a7a8dd1 Author: Lars Michelsen Date: Thu Jan 23 10:57:17 2014 +0100 Commiter: Lars Michelsen Date: Thu Jan 23 10:57:17 2014 +0100 nagvis: new build --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1441849 -> 1443199 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index d27e4b3..02a9653 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Fri Jan 24 10:35:50 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 24 Jan 2014 10:35:50 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: new snapshot Message-ID: <20140124093550.2AE1D8289A@mail.mathias-kettner.de> Module: omd Branch: master Commit: 870e4ac8541011ea84c38cbf027c1953382ad46d URL: http://omdistro.org/projects/omd/repository/revisions/870e4ac8541011ea84c38cbf027c1953382ad46d Author: Lars Michelsen Date: Fri Jan 24 10:35:42 2014 +0100 Commiter: Lars Michelsen Date: Fri Jan 24 10:35:42 2014 +0100 nagvis: new snapshot --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1443199 -> 1443459 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index 02a9653..ac03c9e 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Tue Jan 28 16:37:17 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 28 Jan 2014 16:37:17 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20140128153717.BEC9983409@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3609983c4e93e8ff70f7055e33c5c77164a91b2a URL: http://omdistro.org/projects/omd/repository/revisions/3609983c4e93e8ff70f7055e33c5c77164a91b2a Author: Gerhard Lausser Date: Tue Jan 28 16:35:57 2014 +0100 Commiter: Gerhard Lausser Date: Tue Jan 28 16:35:57 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue Jan 28 16:37:17 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 28 Jan 2014 16:37:17 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.3.2 Message-ID: <20140128153717.DB43183407@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9b18b44c551e3d71dcecdef3681da64bf0e6f14a URL: http://omdistro.org/projects/omd/repository/revisions/9b18b44c551e3d71dcecdef3681da64bf0e6f14a Author: Gerhard Lausser Date: Tue Jan 28 16:35:32 2014 +0100 Commiter: Gerhard Lausser Date: Tue Jan 28 16:35:32 2014 +0100 check_oracle_health: update to 1.9.3.2 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz | Bin 160716 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz | Bin 0 -> 161063 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index af04be8..043e082 100644 --- a/packages/check_oracle_health/Makefile +++ b/packages/check_oracle_health/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_oracle_health -VERSION = 1.9.3.1 +VERSION = 1.9.3.2 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz deleted file mode 100644 index 60184e8..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.3.1.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz new file mode 100644 index 0000000..e4e66ee Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.3.2.tar.gz differ From git at mathias-kettner.de Tue Jan 28 17:06:26 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 28 Jan 2014 17:06:26 +0100 Subject: [omd-commits] OMD Git: omd: check_logfiles: update to 3.6.1 Message-ID: <20140128160626.8090F82627@mail.mathias-kettner.de> Module: omd Branch: master Commit: 79bff2aca76a71e52c8113bfe9056fe3644d2a6a URL: http://omdistro.org/projects/omd/repository/revisions/79bff2aca76a71e52c8113bfe9056fe3644d2a6a Author: Gerhard Lausser Date: Tue Jan 28 17:06:21 2014 +0100 Commiter: Gerhard Lausser Date: Tue Jan 28 17:06:21 2014 +0100 check_logfiles: update to 3.6.1 --- packages/check_logfiles/Makefile | 2 +- packages/check_logfiles/check_logfiles-3.5.2.tar.gz | Bin 202015 -> 0 bytes packages/check_logfiles/check_logfiles-3.6.1.tar.gz | Bin 0 -> 226826 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_logfiles/Makefile b/packages/check_logfiles/Makefile index ae954df..b4e2b60 100644 --- a/packages/check_logfiles/Makefile +++ b/packages/check_logfiles/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_logfiles -VERSION = 3.5.2 +VERSION = 3.6.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_logfiles/check_logfiles-3.5.2.tar.gz b/packages/check_logfiles/check_logfiles-3.5.2.tar.gz deleted file mode 100644 index e5babf4..0000000 Binary files a/packages/check_logfiles/check_logfiles-3.5.2.tar.gz and /dev/null differ diff --git a/packages/check_logfiles/check_logfiles-3.6.1.tar.gz b/packages/check_logfiles/check_logfiles-3.6.1.tar.gz new file mode 100644 index 0000000..4451b0b Binary files /dev/null and b/packages/check_logfiles/check_logfiles-3.6.1.tar.gz differ From git at mathias-kettner.de Fri Jan 31 18:11:04 2014 From: git at mathias-kettner.de (git version control) Date: Fri, 31 Jan 2014 18:11:04 +0100 Subject: [omd-commits] OMD Git: omd: notifications-tt: add Content-Type utf8 header ( Message-ID: <20140131171104.4BCA6808F9@mail.mathias-kettner.de> for umlauts in acknowledge comments) 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: 461dd637b0c132f97e3e4921e9fa2c565db1632a URL: http://omdistro.org/projects/omd/repository/revisions/461dd637b0c132f97e3e4921e9fa2c565db1632a Author: Gerhard Lausser Date: Fri Jan 31 18:09:38 2014 +0100 Commiter: Gerhard Lausser Date: Fri Jan 31 18:09:38 2014 +0100 notifications-tt: add Content-Type utf8 header (for umlauts in acknowledge comments) --- .../skel/etc/mail-templates/notify-by-email.host.tpl | 2 ++ .../skel/etc/mail-templates/notify-by-email.service.tpl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.host.tpl b/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.host.tpl index 37adf13..83339e9 100644 --- a/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.host.tpl +++ b/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.host.tpl @@ -5,6 +5,8 @@ # Mail starts here ---> SUBJECT: *** [% NOTIFICATIONTYPE %] *** [% HOSTNAME %] is [% HOSTSTATE %] TO: [% CONTACTEMAIL %] +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit #FROM: omd at domain.com #REPLY-TO: support at domain.com diff --git a/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.service.tpl b/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.service.tpl index 2fb0001..6d6f6f6 100644 --- a/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.service.tpl +++ b/packages/notifications-tt/skel/etc/mail-templates/notify-by-email.service.tpl @@ -5,6 +5,8 @@ # Mail starts here ---> SUBJECT: *** [% NOTIFICATIONTYPE %] *** [% HOSTNAME %] / [% SERVICEDESC %] is [% SERVICESTATE %] TO: [% CONTACTEMAIL %] +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit #FROM: omd at domain.com #REPLY-TO: support at domain.com