From git at mathias-kettner.de Mon Feb 2 23:09:56 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 02 Feb 2015 23:09:56 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: add missing module Message-ID: <20150202220956.1929F80020@mail.mathias-kettner.de> Module: omd Branch: master Commit: b972222cf35e545688e0a9c895874ec84daf2cd2 URL: http://omdistro.org/projects/omd/repository/revisions/b972222cf35e545688e0a9c895874ec84daf2cd2 Author: Sven Nierlein Date: Thu Jan 29 18:44:13 2015 +0100 Commiter: Sven Nierlein Date: Mon Feb 2 15:20:09 2015 +0100 perl-modules: add missing module --- packages/perl-modules/Makefile | 5 +++-- packages/perl-modules/src/CPAN-Meta-YAML-0.012.tar.gz | Bin 0 -> 47693 bytes 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index 37de960..85b2520 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -6,6 +6,7 @@ DISTRO = $(shell ../../distro) MODULES = \ Algorithm-C3-0.10.tar.gz \ + Any-Moose-0.25.tar.gz \ AppConfig-1.67.tar.gz \ Capture-Tiny-0.27.tar.gz \ Carp-Clan-6.04.tar.gz \ @@ -116,11 +117,11 @@ MODULES = \ podlators-2.5.3.tar.gz \ threads-1.96.tar.gz \ threads-shared-1.46.tar.gz \ - Any-Moose-0.25.tar.gz \ Archive-Tar-2.04.tar.gz \ Archive-Zip-1.43.tar.gz \ Attribute-Handlers-0.96.tar.gz \ Bit-Vector-7.4.tar.gz \ + CPAN-Meta-YAML-0.012.tar.gz \ DBD-mysql-4.029.tar.gz \ Date-Calc-6.3.tar.gz \ Date-Calc-XS-6.3.tar.gz \ @@ -215,6 +216,7 @@ MODULES = \ Params-Validate-1.17.tar.gz \ Sub-Exporter-0.987.tar.gz \ B-Hooks-EndOfScope-0.13.tar.gz \ + Catalyst-Plugin-CustomErrorMessage-0.06.tar.gz \ Class-C3-Adopt-NEXT-0.13.tar.gz \ DateTime-Locale-0.45.tar.gz \ DateTime-TimeZone-1.84.tar.gz \ @@ -253,7 +255,6 @@ MODULES = \ Catalyst-Plugin-Authentication-0.10023.tar.gz \ Catalyst-Plugin-Authorization-Roles-0.09.tar.gz \ Catalyst-Plugin-ConfigLoader-0.34.tar.gz \ - Catalyst-Plugin-CustomErrorMessage-0.06.tar.gz \ Catalyst-Plugin-Redirect-0.02.tar.gz \ Catalyst-Plugin-Static-Simple-0.33.tar.gz \ Catalyst-Devel-1.39.tar.gz diff --git a/packages/perl-modules/src/CPAN-Meta-YAML-0.012.tar.gz b/packages/perl-modules/src/CPAN-Meta-YAML-0.012.tar.gz new file mode 100644 index 0000000..0eb5469 Binary files /dev/null and b/packages/perl-modules/src/CPAN-Meta-YAML-0.012.tar.gz differ From git at mathias-kettner.de Mon Feb 2 23:09:56 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 02 Feb 2015 23:09:56 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: remove orphaned libyaml Message-ID: <20150202220956.331FC8001D@mail.mathias-kettner.de> Module: omd Branch: master Commit: dbeae827875a4931698b9e6adba530f1ae962ea9 URL: http://omdistro.org/projects/omd/repository/revisions/dbeae827875a4931698b9e6adba530f1ae962ea9 Author: Sven Nierlein Date: Thu Jan 29 15:57:06 2015 +0100 Commiter: Sven Nierlein Date: Sun Feb 1 19:26:17 2015 +0100 perl-modules: remove orphaned libyaml Signed-off-by: Sven Nierlein --- packages/perl-modules/Makefile | 2 -- packages/perl-modules/check_files | 2 +- packages/perl-modules/lib/BuildHelper.pm | 3 --- packages/perl-modules/sort_modules | 1 - packages/perl-modules/src/YAML-LibYAML-0.58.tar.gz | Bin 140734 -> 0 bytes 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index d825cb6..37de960 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -285,10 +285,8 @@ build: Module-CoreList-*.tar.gz \ common-sense-*.tar.gz \ Types-Serialiser-*.tar.gz \ - YAML-LibYAML-*.tar.gz \ JSON-*.tar.gz; \ export PERL_JSON_BACKEND='JSON::XS'; \ - export PERL_YAML_BACKEND='YAML::XS'; \ cd $(P5TMPDIST)/src && \ ./build_module.pl -d "$(DISTRO)" -p $(P5TMPDIST)/dest $(MODULES) cd $(P5TMPDIST)/dest/lib/perl5/ && rm -f utils.pm && ln -s ../../../nagios/plugins/utils.pm . diff --git a/packages/perl-modules/check_files b/packages/perl-modules/check_files index 53f7c0a..c63d42b 100755 --- a/packages/perl-modules/check_files +++ b/packages/perl-modules/check_files @@ -14,7 +14,7 @@ for file in $(grep 'tar.gz' Makefile | awk '{ print $1 }' | sed 's/\-[0-9\-\.]*\ done echo "checking for unused files..." -for file in $(cd src && ls -1 *.gz *.tgz *.zip 2>/dev/null | grep -v JSON | grep -v common-sense | grep -v ExtUtils-MakeMaker | grep -v Module-CoreList- | grep -v Types-Serialiser- | grep -v parent- | grep -v YAML-LibYAML- | grep -v version-); do +for file in $(cd src && ls -1 *.gz *.tgz *.zip 2>/dev/null | grep -v JSON | grep -v common-sense | grep -v ExtUtils-MakeMaker | grep -v Module-CoreList- | grep -v Types-Serialiser- | grep -v parent- | grep -v version-); do if [ $(grep -c "$file" Makefile) = 0 ]; then echo "$file is not used anymore" fi diff --git a/packages/perl-modules/lib/BuildHelper.pm b/packages/perl-modules/lib/BuildHelper.pm index cc19f8c..b28dde6 100644 --- a/packages/perl-modules/lib/BuildHelper.pm +++ b/packages/perl-modules/lib/BuildHelper.pm @@ -474,9 +474,6 @@ sub install_module { if($modname eq 'JSON::XS') { $ENV{'PERL_JSON_BACKEND'} = 'JSON::XS'; } - if($modname eq 'YAML::LibYAML') { - $ENV{'PERL_YAML_BACKEND'} = 'YAML::XS'; - } return 1; } diff --git a/packages/perl-modules/sort_modules b/packages/perl-modules/sort_modules index 242b92d..dcdec1f 100755 --- a/packages/perl-modules/sort_modules +++ b/packages/perl-modules/sort_modules @@ -30,7 +30,6 @@ if(defined $ARGV[0] and $ARGV[0] eq '-u') { next if $file =~ m/^JSON\-/mx; next if $file =~ m/^Types\-Serialiser\-\d+/mx; next if $file =~ m/^common\-sense\-\d+/mx; - next if $file =~ m/^YAML\-LibYAML\-\d+/mx; printf $out " %s \\\n", $file; } printf $out " %s\n", $last if defined $last; diff --git a/packages/perl-modules/src/YAML-LibYAML-0.58.tar.gz b/packages/perl-modules/src/YAML-LibYAML-0.58.tar.gz deleted file mode 100644 index 4e50bb9..0000000 Binary files a/packages/perl-modules/src/YAML-LibYAML-0.58.tar.gz and /dev/null differ From git at mathias-kettner.de Mon Feb 2 23:09:55 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 02 Feb 2015 23:09:55 +0100 Subject: [omd-commits] OMD Git: omd: apache: use a2disconf instead of a2dismod for configs Message-ID: <20150202220956.3D6438001A@mail.mathias-kettner.de> Module: omd Branch: master Commit: ff0b2f7959f6258a844c28098859627f67f896c3 URL: http://omdistro.org/projects/omd/repository/revisions/ff0b2f7959f6258a844c28098859627f67f896c3 Author: Sven Nierlein Date: Thu Jan 29 15:34:52 2015 +0100 Commiter: Sven Nierlein Date: Sun Feb 1 19:26:17 2015 +0100 apache: use a2disconf instead of a2dismod for configs --- debian/postrm.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/postrm.in b/debian/postrm.in index cda6910..440d0fb 100644 --- a/debian/postrm.in +++ b/debian/postrm.in @@ -44,9 +44,9 @@ case "$1" in # On e.g. ubuntu 13.10 conf.d is not used anymore, use conf-available APACHE_OMD_CONF="/etc/apache2/conf-available/zzz_omd.conf" fi + ! test -x /usr/sbin/a2disconf || a2disconf zzz_omd rm -f $APACHE_OMD_CONF $APACHE_OMD_EMPTY_CONF rm -f /omd - ! test -x /usr/sbin/a2dismod || a2dismod zzz_omd # Try to remove empty directories if test -d /opt/omd/versions; then rmdir --ignore-fail-on-non-empty /opt/omd/versions From git at mathias-kettner.de Mon Feb 2 23:09:56 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 02 Feb 2015 23:09:56 +0100 Subject: [omd-commits] OMD Git: omd: tests: increase wait timeout Message-ID: <20150202220956.49CB080018@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6b3ab6907b7d7ac2c0ad45a9a15d7f1deb4e7e7c URL: http://omdistro.org/projects/omd/repository/revisions/6b3ab6907b7d7ac2c0ad45a9a15d7f1deb4e7e7c Author: Sven Nierlein Date: Mon Feb 2 15:21:42 2015 +0100 Commiter: Sven Nierlein Date: Mon Feb 2 15:59:19 2015 +0100 tests: increase wait timeout --- t/TestUtils.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/TestUtils.pm b/t/TestUtils.pm index b1e834b..385ca4d 100644 --- a/t/TestUtils.pm +++ b/t/TestUtils.pm @@ -268,7 +268,7 @@ sub remove_test_site { unlike => (list of) regular expressions which must not match content skip_html_lint => flag to disable the html lint checking skip_link_check => (list of) regular expressions to skip the link checks for - waitfor => wait till regex occurs (max 60sec) + waitfor => wait till regex occurs (max 120sec) } =cut @@ -283,7 +283,7 @@ sub test_url { my $now = time(); my $waitfor = $test->{'waitfor'}; my $found = 0; - while($now < $start + 60) { + while($now < $start + 120) { if($page->{'content'} =~ m/$waitfor/mx) { ok(1, "content ".$waitfor." found after ".($now - $start)."seconds"); $found = 1; @@ -293,7 +293,7 @@ sub test_url { $now = time(); $page = _request($test); } - fail("content did not occur within 60 seconds") unless $found; + fail("content did not occur within 120 seconds") unless $found; return $page; } From git at mathias-kettner.de Mon Feb 2 23:09:56 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 02 Feb 2015 23:09:56 +0100 Subject: [omd-commits] OMD Git: omd: stop if core config merges fail Message-ID: <20150202220956.5E36A80020@mail.mathias-kettner.de> Module: omd Branch: master Commit: 189221feae08872801b5bd5f78bf34298c932202 URL: http://omdistro.org/projects/omd/repository/revisions/189221feae08872801b5bd5f78bf34298c932202 Author: Sven Nierlein Date: Mon Feb 2 11:20:45 2015 +0100 Commiter: Sven Nierlein Date: Mon Feb 2 15:20:10 2015 +0100 stop if core config merges fail --- packages/icinga/skel/etc/init.d/icinga | 1 + packages/nagios/skel/etc/init.d/nagios | 1 + packages/shinken/skel/etc/init.d/shinken | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/icinga/skel/etc/init.d/icinga b/packages/icinga/skel/etc/init.d/icinga index 2c5ebb6..4dd8ff6 100755 --- a/packages/icinga/skel/etc/init.d/icinga +++ b/packages/icinga/skel/etc/init.d/icinga @@ -55,6 +55,7 @@ case "$1" in start|restart|reload|checkconfig|check) ###ROOT###/etc/icinga/icinga.d/*.cfg \ ###ROOT###/etc/icinga/icinga.cfg \ > $CFG_FILE || rm -f $CFG_FILE + if [ $? -ne 0 ]; then exit 1; fi esac OPTIONS="-ud" diff --git a/packages/nagios/skel/etc/init.d/nagios b/packages/nagios/skel/etc/init.d/nagios index b234726..1ee30b3 100755 --- a/packages/nagios/skel/etc/init.d/nagios +++ b/packages/nagios/skel/etc/init.d/nagios @@ -68,6 +68,7 @@ case "$1" in start|restart|reload|checkconfig|check) ###ROOT###/etc/nagios/nagios.d/*.cfg \ ###ROOT###/etc/nagios/nagios.cfg \ > $CFG_FILE || rm -f $CFG_FILE + if [ $? -ne 0 ]; then exit 1; fi esac OPTIONS="-ud" diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken index b5a4b24..fcc8943 100644 --- a/packages/shinken/skel/etc/init.d/shinken +++ b/packages/shinken/skel/etc/init.d/shinken @@ -106,6 +106,7 @@ case "$1" in start|restart|reload|checkconfig|check) $SOURCE_ETC/shinken.d/*.cfg \ $SOURCE_ETC/shinken.cfg \ > $TARGET_ETC/shinken.cfg || rm -f $TARGET_ETC/shinken.cfg + if [ $? -ne 0 ]; then exit 1; fi # # Step 2 From git at mathias-kettner.de Mon Feb 2 23:09:56 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 02 Feb 2015 23:09:56 +0100 Subject: [omd-commits] OMD Git: omd: Thruk: Update to 1.86-3 Message-ID: <20150202220956.6CE738001F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5bd6fa126445af6f447e894661952c66bde9a4ee URL: http://omdistro.org/projects/omd/repository/revisions/5bd6fa126445af6f447e894661952c66bde9a4ee Author: Sven Nierlein Date: Mon Feb 2 16:28:41 2015 +0100 Commiter: Sven Nierlein Date: Mon Feb 2 16:28:43 2015 +0100 Thruk: Update to 1.86-3 Signed-off-by: Sven Nierlein --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.86-2.tar.gz | Bin 5158742 -> 0 bytes packages/thruk/Thruk-1.86-3.tar.gz | Bin 0 -> 5160974 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index c013df2..6aa7709 100644 --- a/Changelog +++ b/Changelog @@ -48,7 +48,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for CentOS 6.6 - Added build support for Ubuntu 14.10 - Mod-Gearman: Update 1.5.1 - - Thruk: Update to 1.86-2 + - Thruk: Update to 1.86-3 - Updated Monitoring-Plugins to 2.1.1 - Icinga: Update to 1.12.0 - updated to nail/mailx 12.5 diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index aaf645a..ff4cd81 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.86-2 +VERSION = 1.86-3 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.86-2.tar.gz b/packages/thruk/Thruk-1.86-2.tar.gz deleted file mode 100644 index 8374aad..0000000 Binary files a/packages/thruk/Thruk-1.86-2.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.86-3.tar.gz b/packages/thruk/Thruk-1.86-3.tar.gz new file mode 100644 index 0000000..4217816 Binary files /dev/null and b/packages/thruk/Thruk-1.86-3.tar.gz differ From git at mathias-kettner.de Wed Feb 4 09:26:52 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 04 Feb 2015 09:26:52 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150204082652.6D068807FE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 79aa90bf5fa6039eb9b4a947cfe9467bb46e1a17 URL: http://omdistro.org/projects/omd/repository/revisions/79aa90bf5fa6039eb9b4a947cfe9467bb46e1a17 Author: Lars Michelsen Date: Wed Feb 4 09:26:49 2015 +0100 Commiter: Lars Michelsen Date: Wed Feb 4 09:26:49 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Feb 4 09:26:52 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 04 Feb 2015 09:26:52 +0100 Subject: [omd-commits] OMD Git: omd: FIX: Added PYTHONPATH to site crontab environment Message-ID: <20150204082652.8172F807FA@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4c0efc271b773c0e0d0e6a20471bccda437ddc5b URL: http://omdistro.org/projects/omd/repository/revisions/4c0efc271b773c0e0d0e6a20471bccda437ddc5b Author: Lars Michelsen Date: Wed Feb 4 09:26:43 2015 +0100 Commiter: Lars Michelsen Date: Wed Feb 4 09:26:43 2015 +0100 FIX: Added PYTHONPATH to site crontab environment --- Changelog | 2 ++ packages/maintenance/merge-crontabs | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Changelog b/Changelog index c013df2..3833cc9 100644 --- a/Changelog +++ b/Changelog @@ -29,6 +29,8 @@ This file documents the revision history for the Open Monitoring Distribution - FIX: Update mechanism detects obsolete but non empty directories correctly and asks the user whether or not to delete them - FIX: SLES omd init-Script does not use default runlevel 4 anymore + - FIX: Added PYTHONPATH to site crontab for being able to access + the sites python modules as when run in interactive mdoe - NagVis: - Update to version 1.8rc1 - Removed deprecated directory var/nagvis/userfiles. This was diff --git a/packages/maintenance/merge-crontabs b/packages/maintenance/merge-crontabs index c571fb7..00517de 100755 --- a/packages/maintenance/merge-crontabs +++ b/packages/maintenance/merge-crontabs @@ -9,18 +9,19 @@ omd_config = {} execfile('%s/etc/omd/site.conf' % os.environ['OMD_ROOT'], {}, omd_config) sys.stdout.write("""# -# Do not edit this file. It will be recreated each time OMD -# is started or reloaded. -# -# execute 'omd reload crontab' +# Do not edit this file. It will be recreated each time OMD +# is started or reloaded. +# +# execute 'omd reload crontab' # to rebuild this file out of %s/etc/cron.d/* -# +# # --ENVIRONMENT------------------------------------------------ """ % os.environ['OMD_ROOT']) sys.stdout.write("OMD_ROOT=%s\n" % os.environ['OMD_ROOT']) sys.stdout.write("OMD_SITE=%s\n" % os.environ['OMD_SITE']) sys.stdout.write("PATH=%s\n" % os.environ['PATH']) +sys.stdout.write("PYTHONPATH=%s\n" % os.environ['PYTHONPATH']) sys.stdout.write("MAILTO=\"%s\"\n" % omd_config.get('CONFIG_ADMIN_MAIL', '')) sys.stdout.write("# ------------------------------------------------------------\n") From git at mathias-kettner.de Fri Feb 13 15:41:07 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 13 Feb 2015 15:41:07 +0100 Subject: [omd-commits] OMD Git: omd: thruk update 1.86-4 Message-ID: <20150213144108.1057A806E1@mail.mathias-kettner.de> Module: omd Branch: master Commit: e953bad18e894d8698375184d7ea08d4bf928f3f URL: http://omdistro.org/projects/omd/repository/revisions/e953bad18e894d8698375184d7ea08d4bf928f3f Author: Sven Nierlein Date: Fri Feb 13 13:35:45 2015 +0100 Commiter: Sven Nierlein Date: Fri Feb 13 13:35:45 2015 +0100 thruk update 1.86-4 --- Changelog | 2 +- packages/thruk/Makefile | 2 +- packages/thruk/Thruk-1.86-3.tar.gz | Bin 5160974 -> 0 bytes packages/thruk/Thruk-1.86-4.tar.gz | Bin 0 -> 5196764 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index afb76bd..284ebb6 100644 --- a/Changelog +++ b/Changelog @@ -50,7 +50,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for CentOS 6.6 - Added build support for Ubuntu 14.10 - Mod-Gearman: Update 1.5.1 - - Thruk: Update to 1.86-3 + - Thruk: Update to 1.86-4 - Updated Monitoring-Plugins to 2.1.1 - Icinga: Update to 1.12.0 - updated to nail/mailx 12.5 diff --git a/packages/thruk/Makefile b/packages/thruk/Makefile index ff4cd81..35fabf3 100644 --- a/packages/thruk/Makefile +++ b/packages/thruk/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = Thruk -VERSION = 1.86-3 +VERSION = 1.86-4 DIR = $(NAME)-$(VERSION) PERLARCH = $(shell $(PERL) -e 'use Config; print $$Config{archname}') diff --git a/packages/thruk/Thruk-1.86-3.tar.gz b/packages/thruk/Thruk-1.86-3.tar.gz deleted file mode 100644 index 4217816..0000000 Binary files a/packages/thruk/Thruk-1.86-3.tar.gz and /dev/null differ diff --git a/packages/thruk/Thruk-1.86-4.tar.gz b/packages/thruk/Thruk-1.86-4.tar.gz new file mode 100644 index 0000000..4888912 Binary files /dev/null and b/packages/thruk/Thruk-1.86-4.tar.gz differ From git at mathias-kettner.de Fri Feb 13 15:41:08 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 13 Feb 2015 15:41:08 +0100 Subject: [omd-commits] OMD Git: omd: Mod-Gearman: Update 1.5.2 Message-ID: <20150213144108.2381580198@mail.mathias-kettner.de> Module: omd Branch: master Commit: 2822a58adb3134f94918bbcd0243a196869e2d62 URL: http://omdistro.org/projects/omd/repository/revisions/2822a58adb3134f94918bbcd0243a196869e2d62 Author: Sven Nierlein Date: Fri Feb 13 14:09:14 2015 +0100 Commiter: Sven Nierlein Date: Fri Feb 13 14:09:14 2015 +0100 Mod-Gearman: Update 1.5.2 --- Changelog | 2 +- packages/mod-gearman/Makefile | 2 +- packages/mod-gearman/mod_gearman-1.5.1.tar.gz | Bin 321935 -> 0 bytes packages/mod-gearman/mod_gearman-1.5.2.tar.gz | Bin 0 -> 322057 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 284ebb6..4e57a69 100644 --- a/Changelog +++ b/Changelog @@ -49,7 +49,7 @@ This file documents the revision history for the Open Monitoring Distribution - Added build support for SLES 12 - Added build support for CentOS 6.6 - Added build support for Ubuntu 14.10 - - Mod-Gearman: Update 1.5.1 + - Mod-Gearman: Update 1.5.2 - Thruk: Update to 1.86-4 - Updated Monitoring-Plugins to 2.1.1 - Icinga: Update to 1.12.0 diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile index 61c87d3..fa9d8e2 100644 --- a/packages/mod-gearman/Makefile +++ b/packages/mod-gearman/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mod_gearman -VERSION = 1.5.1 +VERSION = 1.5.2 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }') DIR = mod_gearman-$(VERSION) diff --git a/packages/mod-gearman/mod_gearman-1.5.1.tar.gz b/packages/mod-gearman/mod_gearman-1.5.1.tar.gz deleted file mode 100644 index 907cfbc..0000000 Binary files a/packages/mod-gearman/mod_gearman-1.5.1.tar.gz and /dev/null differ diff --git a/packages/mod-gearman/mod_gearman-1.5.2.tar.gz b/packages/mod-gearman/mod_gearman-1.5.2.tar.gz new file mode 100644 index 0000000..8f0da56 Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.5.2.tar.gz differ From git at mathias-kettner.de Fri Feb 20 14:22:46 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 20 Feb 2015 14:22:46 +0100 Subject: [omd-commits] OMD Git: omd: Changed wording of error message Message-ID: <20150220132246.E9991807EB@mail.mathias-kettner.de> Module: omd Branch: master Commit: ec22afa8d5530d647a63df09693d9f73964baf1d URL: http://omdistro.org/projects/omd/repository/revisions/ec22afa8d5530d647a63df09693d9f73964baf1d Author: Lars Michelsen Date: Fri Feb 20 14:22:37 2015 +0100 Commiter: Lars Michelsen Date: Fri Feb 20 14:22:37 2015 +0100 Changed wording of error message --- packages/apache-omd/APACHE_TCP_PORT.hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache-omd/APACHE_TCP_PORT.hook b/packages/apache-omd/APACHE_TCP_PORT.hook index 0043e5e..d055eba 100755 --- a/packages/apache-omd/APACHE_TCP_PORT.hook +++ b/packages/apache-omd/APACHE_TCP_PORT.hook @@ -25,7 +25,7 @@ port_is_used () conf=/omd/sites/$S/etc/omd/site.conf [ $S != $OMD_SITE ] || continue # skip current site if ! ls $conf >/dev/null 2>&1; then - echo "ERROR: Failed to read config of site ${S}. APACHE_TCP_PORT will propably be allocated twice" >&2 + echo "ERROR: Failed to read config of site ${S}. APACHE_TCP_PORT will possibly be allocated twice" >&2 continue fi if grep -qx "CONFIG_APACHE_TCP_PORT='$PORT'" < $conf > /dev/null 2>&1 ; then From git at mathias-kettner.de Fri Feb 20 14:22:46 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 20 Feb 2015 14:22:46 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150220132247.04AC980665@mail.mathias-kettner.de> Module: omd Branch: master Commit: 3f51ee00e4fad586dcd360116319ed02ee01bdb2 URL: http://omdistro.org/projects/omd/repository/revisions/3f51ee00e4fad586dcd360116319ed02ee01bdb2 Author: Lars Michelsen Date: Fri Feb 20 14:22:43 2015 +0100 Commiter: Lars Michelsen Date: Fri Feb 20 14:22:43 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Fri Feb 20 16:45:25 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 20 Feb 2015 16:45:25 +0100 Subject: [omd-commits] OMD Git: omd: SLES11SP3: needs libtool Message-ID: <20150220154526.0001680864@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0b72576c614eaae452ff0d326e9fa52e4b4a9be6 URL: http://omdistro.org/projects/omd/repository/revisions/0b72576c614eaae452ff0d326e9fa52e4b4a9be6 Author: Gerhard Lausser Date: Fri Feb 20 16:44:44 2015 +0100 Commiter: Gerhard Lausser Date: Fri Feb 20 16:44:44 2015 +0100 SLES11SP3: needs libtool --- distros/Makefile.SLES_11SP3 | 1 + 1 file changed, 1 insertion(+) diff --git a/distros/Makefile.SLES_11SP3 b/distros/Makefile.SLES_11SP3 index 3dbdf34..57b51e0 100644 --- a/distros/Makefile.SLES_11SP3 +++ b/distros/Makefile.SLES_11SP3 @@ -30,6 +30,7 @@ BUILD_PACKAGES += python-devel BUILD_PACKAGES += readline-devel BUILD_PACKAGES += apache2-devel BUILD_PACKAGES += freeradius-client-devel +BUILD_PACKAGES += libtool # needed for gearman OS_PACKAGES = OS_PACKAGES += net-tools # traceroute is needed for Check_MK parent scan OS_PACKAGES += apache2 From git at mathias-kettner.de Mon Feb 23 10:15:20 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 23 Feb 2015 10:15:20 +0100 Subject: [omd-commits] OMD Git: omd: omd: skip non-directories when getting apache port Message-ID: <20150223091520.65686802E8@mail.mathias-kettner.de> Module: omd Branch: master Commit: a7fcc3df979b256558417e8556a2bf72e7b6ece0 URL: http://omdistro.org/projects/omd/repository/revisions/a7fcc3df979b256558417e8556a2bf72e7b6ece0 Author: Sven Nierlein Date: Mon Feb 23 10:14:09 2015 +0100 Commiter: Sven Nierlein Date: Mon Feb 23 10:14:09 2015 +0100 omd: skip non-directories when getting apache port --- packages/apache-omd/APACHE_TCP_PORT.hook | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/apache-omd/APACHE_TCP_PORT.hook b/packages/apache-omd/APACHE_TCP_PORT.hook index d055eba..7687844 100755 --- a/packages/apache-omd/APACHE_TCP_PORT.hook +++ b/packages/apache-omd/APACHE_TCP_PORT.hook @@ -22,6 +22,9 @@ port_is_used () { local PORT=$1 for S in $(ls /omd/sites); do + if [ ! -d $S ]; then + continue + fi conf=/omd/sites/$S/etc/omd/site.conf [ $S != $OMD_SITE ] || continue # skip current site if ! ls $conf >/dev/null 2>&1; then From git at mathias-kettner.de Wed Feb 25 11:10:05 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 25 Feb 2015 11:10:05 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.4.6 Message-ID: <20150225101005.2A90F80267@mail.mathias-kettner.de> Module: omd Branch: master Commit: d3c16dbf0e1ff5a3b7a6a763f2023c2abf95934c URL: http://omdistro.org/projects/omd/repository/revisions/d3c16dbf0e1ff5a3b7a6a763f2023c2abf95934c Author: Gerhard Lausser Date: Wed Feb 25 11:04:13 2015 +0100 Commiter: Gerhard Lausser Date: Wed Feb 25 11:04:13 2015 +0100 check_oracle_health: update to 1.9.4.6 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz | Bin 161992 -> 0 bytes packages/check_oracle_health/check_oracle_health-1.9.4.6.tar.gz | Bin 0 -> 162121 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index c28204d..b8e0e59 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.4.5 +VERSION = 1.9.4.6 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz deleted file mode 100644 index d7f759b..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz and /dev/null differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.4.6.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.4.6.tar.gz new file mode 100644 index 0000000..f2ce100 Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.4.6.tar.gz differ From git at mathias-kettner.de Wed Feb 25 11:10:05 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 25 Feb 2015 11:10:05 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150225101005.3AF29800FA@mail.mathias-kettner.de> Module: omd Branch: master Commit: f5238da38af94e1b0d8256dbc6067029daf021e3 URL: http://omdistro.org/projects/omd/repository/revisions/f5238da38af94e1b0d8256dbc6067029daf021e3 Author: Gerhard Lausser Date: Wed Feb 25 11:06:37 2015 +0100 Commiter: Gerhard Lausser Date: Wed Feb 25 11:06:37 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Feb 25 14:32:01 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 25 Feb 2015 14:32:01 +0100 Subject: [omd-commits] OMD Git: omd: fix apache tcp port hook Message-ID: <20150225133201.5BBB98146F@mail.mathias-kettner.de> Module: omd Branch: master Commit: ece853628d41defbd8e3744bbe08c25378718c90 URL: http://omdistro.org/projects/omd/repository/revisions/ece853628d41defbd8e3744bbe08c25378718c90 Author: Sven Nierlein Date: Wed Feb 25 14:30:21 2015 +0100 Commiter: Sven Nierlein Date: Wed Feb 25 14:30:51 2015 +0100 fix apache tcp port hook Signed-off-by: Sven Nierlein --- packages/apache-omd/APACHE_TCP_PORT.hook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apache-omd/APACHE_TCP_PORT.hook b/packages/apache-omd/APACHE_TCP_PORT.hook index 7687844..ab9297d 100755 --- a/packages/apache-omd/APACHE_TCP_PORT.hook +++ b/packages/apache-omd/APACHE_TCP_PORT.hook @@ -22,7 +22,7 @@ port_is_used () { local PORT=$1 for S in $(ls /omd/sites); do - if [ ! -d $S ]; then + if [ ! -d /omd/sites/$S ]; then continue fi conf=/omd/sites/$S/etc/omd/site.conf From git at mathias-kettner.de Sat Feb 28 19:26:27 2015 From: git at mathias-kettner.de (git version control) Date: Sat, 28 Feb 2015 19:26:27 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150228182627.F154E80646@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6d420b6f9e80ac6539b6f10a06e809744936b7ba URL: http://omdistro.org/projects/omd/repository/revisions/6d420b6f9e80ac6539b6f10a06e809744936b7ba Author: Lars Michelsen Date: Sat Feb 28 19:25:57 2015 +0100 Commiter: Lars Michelsen Date: Sat Feb 28 19:25:57 2015 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Sat Feb 28 19:26:27 2015 From: git at mathias-kettner.de (git version control) Date: Sat, 28 Feb 2015 19:26:27 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to 1.8 Message-ID: <20150228182628.0C6F580635@mail.mathias-kettner.de> Module: omd Branch: master Commit: c73cf7655625eefc0ce4fce078040ac907042bc2 URL: http://omdistro.org/projects/omd/repository/revisions/c73cf7655625eefc0ce4fce078040ac907042bc2 Author: Lars Michelsen Date: Sat Feb 28 19:25:48 2015 +0100 Commiter: Lars Michelsen Date: Sat Feb 28 19:25:48 2015 +0100 nagvis: Updated to 1.8 --- Changelog | 2 +- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1493293 -> 0 bytes packages/nagvis/nagvis-1.8.tar.gz | Bin 0 -> 1477919 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 4e57a69..639a15e 100644 --- a/Changelog +++ b/Changelog @@ -32,7 +32,7 @@ This file documents the revision history for the Open Monitoring Distribution - FIX: Added PYTHONPATH to site crontab for being able to access the sites python modules as when run in interactive mdoe - NagVis: - - Update to version 1.8rc1 + - Update to version 1.8 - Removed deprecated directory var/nagvis/userfiles. This was deprecated since version 0.52. During the update to 1.30, the directory and all its contents will be removed. This should be diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile index 7d0f044..734102d 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.8-nightly +VERSION = 1.8 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 deleted file mode 100644 index e033996..0000000 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and /dev/null differ diff --git a/packages/nagvis/nagvis-1.8.tar.gz b/packages/nagvis/nagvis-1.8.tar.gz new file mode 100644 index 0000000..ec19e4d Binary files /dev/null and b/packages/nagvis/nagvis-1.8.tar.gz differ