From git at mathias-kettner.de Mon Jun 4 14:56:28 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 04 Jun 2012 14:56:28 +0200 Subject: [omd-commits] OMD Git: omd: Check_MK/LS 1.2.0b6 Message-ID: <20120604125628.9E6F88423F4@mail.mathias-kettner.de> Module: omd Branch: master Commit: 90d7f351a404fdf00af61616b475ff43ddf57fe4 URL: http://omdistro.org/projects/omd/repository/revisions/90d7f351a404fdf00af61616b475ff43ddf57fe4 Author: Mathias Kettner Date: Mon Jun 4 14:52:52 2012 +0200 Commiter: Mathias Kettner Date: Mon Jun 4 14:52:52 2012 +0200 Check_MK/LS 1.2.0b6 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- ...k_mk-1.2.0b5.tar.gz => check_mk-1.2.0b6.tar.gz} | Bin 11477458 -> 11595848 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/mk-livestatus/Makefile | 2 +- .../mk-livestatus/mk-livestatus-1.2.0b4.tar.gz | Bin 371654 -> 0 bytes .../mk-livestatus/mk-livestatus-1.2.0b6.tar.gz | Bin 0 -> 371664 bytes 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index fdb9620..5622922 100644 --- a/Changelog +++ b/Changelog @@ -9,7 +9,7 @@ This file documents the revision history for the Open Monitoring Distribution - Mod-Gearman: Updated to version 1.3.2 - Thruk: Update to 1.28 - Icinga: Update to 1.7.0 - - Check_MK: Added 1.2.0b5 release + - Check_MK: Added 1.2.0b6 release - Support Ubuntu 12.04 (Precise) 0.54 Apr 02 2012 diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index 40e7363..35c6952 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.0b5 +VERSION = 1.2.0b6 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_mk/check_mk-1.2.0b5.tar.gz b/packages/check_mk/check_mk-1.2.0b6.tar.gz similarity index 71% rename from packages/check_mk/check_mk-1.2.0b5.tar.gz rename to packages/check_mk/check_mk-1.2.0b6.tar.gz index 25f7282..59074c8 100644 Binary files a/packages/check_mk/check_mk-1.2.0b5.tar.gz and b/packages/check_mk/check_mk-1.2.0b6.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index 3a698fa..39b3f84 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.0b5' +check_mk_version = '1.2.0b6' 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/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index 7ca6ebf..5e65589 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.0b4 +VERSION = 1.2.0b6 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0b4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0b4.tar.gz deleted file mode 100644 index 7690468..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.0b4.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0b6.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0b6.tar.gz new file mode 100644 index 0000000..0314e0f Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.0b6.tar.gz differ From git at mathias-kettner.de Mon Jun 4 23:51:05 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 04 Jun 2012 23:51:05 +0200 Subject: [omd-commits] OMD Git: omd: Thruk: Update to 1.32 Message-ID: <20120604215105.445338422E6@mail.mathias-kettner.de> Module: omd Branch: master Commit: f36420df579722c49b08197f8381f476c86bfb88 URL: http://omdistro.org/projects/omd/repository/revisions/f36420df579722c49b08197f8381f476c86bfb88 Author: Sven Nierlein Date: Tue May 15 19:38:30 2012 +0200 Commiter: Sven Nierlein Date: Mon Jun 4 23:50:41 2012 +0200 Thruk: Update to 1.32 --- Changelog | 2 +- packages/perl-modules/Makefile | 15 +++- packages/perl-modules/src/Any-Moose-0.18.tar.gz | Bin 0 -> 15319 bytes .../src/Class-Method-Modifiers-1.09.tar.gz | Bin 0 -> 29104 bytes packages/perl-modules/src/Data-Types-0.09.tar.gz | Bin 0 -> 8527 bytes .../src/Devel-GlobalDestruction-0.04.tar.gz | Bin 46820 -> 0 bytes .../src/Devel-GlobalDestruction-0.05.tar.gz | Bin 0 -> 48866 bytes packages/perl-modules/src/MongoDB-0.45.tar.gz | Bin 0 -> 1421684 bytes .../src/Monitoring-Availability-0.28.tar.gz | Bin 51098 -> 0 bytes .../src/Monitoring-Availability-0.37_2.tar.gz | Bin 0 -> 53144 bytes packages/perl-modules/src/Moose-2.0403.tar.gz | Bin 676895 -> 0 bytes packages/perl-modules/src/Moose-2.0602.tar.gz | Bin 0 -> 696832 bytes packages/perl-modules/src/PDF-Reuse-0.35.tar.gz | Bin 62248 -> 63027 bytes packages/perl-modules/src/Tie-IxHash-1.22.tar.gz | Bin 0 -> 8552 bytes packages/perl-modules/src/boolean-0.28.tar.gz | Bin 0 -> 31810 bytes packages/thruk/Makefile | 7 +- packages/thruk/Thruk-1.28.tar.gz | Bin 3735189 -> 0 bytes packages/thruk/Thruk-1.32.tar.gz | Bin 0 -> 3833832 bytes packages/thruk/patches/0001-no_auto_install.patch | 6 +- .../thruk/patches/0001-skel_adjustments.skel_patch | 52 +++++++++++--- packages/thruk/patches/0002-caching.patch | 6 +- packages/thruk/patches/0002-thruk_init.skel_patch | 10 +++ packages/thruk/skel.permissions | 13 ++-- packages/thruk/skel/etc/thruk/reload_cron.sh | 10 +++ packages/thruk/skel/etc/thruk/ssi/README.txt | 2 +- packages/thruk/skel/etc/thruk/templates/README.txt | 5 ++ t/20-package_nagvis.t | 10 ++-- t/20-package_thruk.t | 75 ++++++++++++++++++-- t/TestUtils.pm | 2 +- 29 files changed, 174 insertions(+), 41 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=f36420df579722c49b08197f8381f476c86bfb88 From git at mathias-kettner.de Tue Jun 5 10:50:21 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 05 Jun 2012 10:50:21 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20120605085021.BA8A88423F7@mail.mathias-kettner.de> Module: omd Branch: master Commit: bf0b3d853ab650589b60a65c6b73c425668459c9 URL: http://omdistro.org/projects/omd/repository/revisions/bf0b3d853ab650589b60a65c6b73c425668459c9 Author: Lars Michelsen Date: Tue Jun 5 10:50:36 2012 +0200 Commiter: Lars Michelsen Date: Tue Jun 5 10:50:36 2012 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue Jun 5 10:50:21 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 05 Jun 2012 10:50:21 +0200 Subject: [omd-commits] OMD Git: omd: omd: Improved exception handling during omd update/cp/mv ( Asking for retry/accept/abort now) Message-ID: <20120605085021.CA8318422EA@mail.mathias-kettner.de> Module: omd Branch: master Commit: d7bae6f66b48afef023976d8e13066f659cf30a5 URL: http://omdistro.org/projects/omd/repository/revisions/d7bae6f66b48afef023976d8e13066f659cf30a5 Author: Lars Michelsen Date: Tue Jun 5 10:49:51 2012 +0200 Commiter: Lars Michelsen Date: Tue Jun 5 10:49:51 2012 +0200 omd: Improved exception handling during omd update/cp/mv (Asking for retry/accept/abort now) --- Changelog | 2 ++ packages/omd/omd | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Changelog b/Changelog index 65c7899..5e9dec6 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,8 @@ This file documents the revision history for the Open Monitoring Distribution - omd: - Fixed problem updating omd sites without tmpfs: Not removing whole tmp/ directory but only the contents + - Improved exception handling during omd update/cp/mv (Asking + for retry/accept/abort now) - RPMS: Not checking for removed version during pkg release update (Does not mean omd version update.) - Mod-Gearman: Updated to version 1.3.0 diff --git a/packages/omd/omd b/packages/omd/omd index 55daae0..6dfbecb 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2579,15 +2579,36 @@ def walk_skel(root, handler, args, exclude_if_in = None, relbase = '.'): if exclude_if_in and os.path.exists(exclude_if_in + "/" + path): continue - try: - handler(path, *args) - except Exception, e: - sys.stderr.write(error * 40 + "\n") - sys.stderr.write(error + " Exception %s\n" % (path)) - sys.stderr.write(error + " " + traceback.format_exc().replace('\n', "\n" + error + " ") + "\n") - sys.stderr.write(error * 40 + "\n") - #sys.stderr.write("Error updating %s/%s: %s\n" % (g_sitedir, path, e)) - #raise + todo = True + while todo: + try: + handler(path, *args) + todo = False + except Exception, e: + todo = False + sys.stderr.write(error * 40 + "\n") + sys.stderr.write(error + " Exception %s\n" % (path)) + sys.stderr.write(error + " " + traceback.format_exc().replace('\n', "\n" + error + " ") + "\n") + sys.stderr.write(error * 40 + "\n") + + # If running in interactive mode ask the user to terminate or retry + # In case of non interactive mode just throw the exception + if opt_conflict == 'ask': + options = [ + ("retry", "Retry the operation"), + ("accept", "Continue with next files"), + ("abort", "Stop here and abort update!") + ] + choice = ask_user_choices( + 'Problem occured', + 'We detected an exception (printed above). You have the ' + 'chance to fix things and retry the operation now.', + options + ) + if choice == 'abort': + bail_out("Update aborted.") + elif choice == 'retry': + todo = True # Try again def main_update(args, options={}): From git at mathias-kettner.de Tue Jun 5 11:02:05 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 05 Jun 2012 11:02:05 +0200 Subject: [omd-commits] OMD Git: omd: shinken: removed dependency Message-ID: <20120605090205.6FBDB8422EA@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8f01f3e938435cc16554801469face03a88c7d8f URL: http://omdistro.org/projects/omd/repository/revisions/8f01f3e938435cc16554801469face03a88c7d8f Author: Sven Nierlein Date: Tue Jun 5 11:01:33 2012 +0200 Commiter: Sven Nierlein Date: Tue Jun 5 11:01:56 2012 +0200 shinken: removed dependency --- packages/shinken/MONGODB.hook | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/packages/shinken/MONGODB.hook b/packages/shinken/MONGODB.hook index 10121c2..b01e9f5 100755 --- a/packages/shinken/MONGODB.hook +++ b/packages/shinken/MONGODB.hook @@ -2,7 +2,7 @@ # Alias: Start site-local MongoDB Daemon # Menu: Addons -# Description: +# Description: # If you want to use addons based on MongoDB (like distributed # log storage for Shinken), then you can activate # this option and a site specific MongoDB daemon will be started. @@ -15,6 +15,4 @@ case "$1" in echo "on: enable" echo "off: disable" ;; - depends) - [ "$CONFIG_CORE" = shinken ] esac From git at mathias-kettner.de Thu Jun 7 12:33:44 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 07 Jun 2012 12:33:44 +0200 Subject: [omd-commits] OMD Git: omd: Check_MK 1.2.0p1 Message-ID: <20120607103345.115698422E8@mail.mathias-kettner.de> Module: omd Branch: master Commit: fd45ab2c338f43560dafd4c0b4ec076b00648078 URL: http://omdistro.org/projects/omd/repository/revisions/fd45ab2c338f43560dafd4c0b4ec076b00648078 Author: Mathias Kettner Date: Thu Jun 7 12:31:34 2012 +0200 Commiter: Mathias Kettner Date: Thu Jun 7 12:31:34 2012 +0200 Check_MK 1.2.0p1 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- ...k_mk-1.2.0b6.tar.gz => check_mk-1.2.0p1.tar.gz} | Bin 11595848 -> 11604623 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- .../skel/etc/nagios/conf.d/check_mk_templates.cfg | 3 +++ packages/mk-livestatus/Makefile | 2 +- .../mk-livestatus/mk-livestatus-1.2.0b6.tar.gz | Bin 371664 -> 0 bytes .../mk-livestatus/mk-livestatus-1.2.0p1.tar.gz | Bin 0 -> 371663 bytes 8 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index 5622922..f9d71ac 100644 --- a/Changelog +++ b/Changelog @@ -9,7 +9,7 @@ This file documents the revision history for the Open Monitoring Distribution - Mod-Gearman: Updated to version 1.3.2 - Thruk: Update to 1.28 - Icinga: Update to 1.7.0 - - Check_MK: Added 1.2.0b6 release + - Check_MK: Added 1.2.0p1 release - Support Ubuntu 12.04 (Precise) 0.54 Apr 02 2012 diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index 35c6952..27caa4a 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.0b6 +VERSION = 1.2.0p1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_mk/check_mk-1.2.0b6.tar.gz b/packages/check_mk/check_mk-1.2.0p1.tar.gz similarity index 70% rename from packages/check_mk/check_mk-1.2.0b6.tar.gz rename to packages/check_mk/check_mk-1.2.0p1.tar.gz index 59074c8..3a46300 100644 Binary files a/packages/check_mk/check_mk-1.2.0b6.tar.gz and b/packages/check_mk/check_mk-1.2.0p1.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index 39b3f84..d71faf0 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.0b6' +check_mk_version = '1.2.0p1' 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/nagios/conf.d/check_mk_templates.cfg b/packages/check_mk/skel/etc/nagios/conf.d/check_mk_templates.cfg index 7da717a..ff6cd98 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 @@ -326,6 +326,9 @@ define command { NOTIFY_LONGSERVICEOUTPUT='$LONGSERVICEOUTPUT$' \ NOTIFY_SERVICEPERFDATA='$SERVICEPERFDATA$' \ NOTIFY_SERVICECHECKCOMMAND='$SERVICECHECKCOMMAND$' \ + NOTIFY_DATE='$DATE$' \ + NOTIFY_SHORTDATETIME='$SHORTDATETIME$' \ + NOTIFY_LONGDATETIME='$LONGDATETIME$' \ check_mk --notify } diff --git a/packages/mk-livestatus/Makefile b/packages/mk-livestatus/Makefile index 5e65589..6d0f837 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.0b6 +VERSION = 1.2.0p1 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0b6.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0b6.tar.gz deleted file mode 100644 index 0314e0f..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.0b6.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.0p1.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.0p1.tar.gz new file mode 100644 index 0000000..874307d Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.0p1.tar.gz differ From git at mathias-kettner.de Thu Jun 7 12:33:44 2012 From: git at mathias-kettner.de (git version control) Date: Thu, 07 Jun 2012 12:33:44 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20120607103345.351878405E7@mail.mathias-kettner.de> Module: omd Branch: master Commit: a0728a6e09fa773844d24241b591684006847a8f URL: http://omdistro.org/projects/omd/repository/revisions/a0728a6e09fa773844d24241b591684006847a8f Author: Mathias Kettner Date: Thu Jun 7 12:31:45 2012 +0200 Commiter: Mathias Kettner Date: Thu Jun 7 12:31:45 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Fri Jun 8 23:23:16 2012 From: git at mathias-kettner.de (git version control) Date: Fri, 08 Jun 2012 23:23:16 +0200 Subject: [omd-commits] OMD Git: omd: Updated to Jmx4Perl 1.05 Message-ID: <20120608212316.5ADC1842DCB@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7c3ebdfb5bc8233a7be63f84b46dd0af2d724f4a URL: http://omdistro.org/projects/omd/repository/revisions/7c3ebdfb5bc8233a7be63f84b46dd0af2d724f4a Author: roland Date: Fri Jun 8 23:22:22 2012 +0200 Commiter: roland Date: Fri Jun 8 23:22:22 2012 +0200 Updated to Jmx4Perl 1.05 --- packages/jmx4perl/Makefile | 2 +- packages/jmx4perl/jmx4perl-1.04.tar.gz | Bin 202283 -> 0 bytes packages/jmx4perl/jmx4perl-1.05.tar.gz | Bin 0 -> 342571 bytes packages/perl-modules/Makefile | 2 +- .../perl-modules/src/XML-Tidy-1.12.B55J2qn.tgz | Bin 22540 -> 0 bytes packages/perl-modules/src/XML-Twig-3.40.tar.gz | Bin 0 -> 385800 bytes 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/jmx4perl/Makefile b/packages/jmx4perl/Makefile index c25b78f..c54eb19 100644 --- a/packages/jmx4perl/Makefile +++ b/packages/jmx4perl/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = jmx4perl -VERSION = 1.04 +VERSION = 1.05 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/jmx4perl/jmx4perl-1.04.tar.gz b/packages/jmx4perl/jmx4perl-1.04.tar.gz deleted file mode 100644 index 2aacceb..0000000 Binary files a/packages/jmx4perl/jmx4perl-1.04.tar.gz and /dev/null differ diff --git a/packages/jmx4perl/jmx4perl-1.05.tar.gz b/packages/jmx4perl/jmx4perl-1.05.tar.gz new file mode 100644 index 0000000..d250a44 Binary files /dev/null and b/packages/jmx4perl/jmx4perl-1.05.tar.gz differ diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index ced6592..ae00de8 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -253,7 +253,7 @@ MODULES = \ Perl-Critic-Policy-Dynamic-NoIndirect-0.06.tar.gz \ Sub-Exporter-0.982.tar.gz \ Test-Perl-Critic-1.02.tar.gz \ - XML-Tidy-1.12.B55J2qn.tgz \ + XML-Twig-3.40.tar.gz \ B-Hooks-EndOfScope-0.11.tar.gz \ Catalyst-Plugin-CustomErrorMessage-0.06.tar.gz \ Check-ISA-0.04.tar.gz \ diff --git a/packages/perl-modules/src/XML-Tidy-1.12.B55J2qn.tgz b/packages/perl-modules/src/XML-Tidy-1.12.B55J2qn.tgz deleted file mode 100644 index 796b8bf..0000000 Binary files a/packages/perl-modules/src/XML-Tidy-1.12.B55J2qn.tgz and /dev/null differ diff --git a/packages/perl-modules/src/XML-Twig-3.40.tar.gz b/packages/perl-modules/src/XML-Twig-3.40.tar.gz new file mode 100644 index 0000000..fe4e3fc Binary files /dev/null and b/packages/perl-modules/src/XML-Twig-3.40.tar.gz differ From git at mathias-kettner.de Sat Jun 9 18:08:48 2012 From: git at mathias-kettner.de (git version control) Date: Sat, 09 Jun 2012 18:08:48 +0200 Subject: [omd-commits] OMD Git: omd: omd: added wheezy makefile Message-ID: <20120609160848.933A68423D1@mail.mathias-kettner.de> Module: omd Branch: master Commit: ec8e67efdf7f9ba310ef65b0629d6d56881fb3c1 URL: http://omdistro.org/projects/omd/repository/revisions/ec8e67efdf7f9ba310ef65b0629d6d56881fb3c1 Author: Sven Nierlein Date: Sat Jun 9 18:07:43 2012 +0200 Commiter: Sven Nierlein Date: Sat Jun 9 18:08:44 2012 +0200 omd: added wheezy makefile --- distro | 5 ++- distros/Makefile.DEBIAN_7.0 | 80 +++++++++++++++++++++++++++++++++++++++ packages/mysql-omd/skel/.my.cnf | 2 + 3 files changed, 86 insertions(+), 1 deletions(-) diff --git a/distro b/distro index a691ece..de0917e 100755 --- a/distro +++ b/distro @@ -6,7 +6,7 @@ # Ubuntu is detected with /etc/lsb-release SEP=${1:- } -if [ -e /etc/lsb-release ] +if [ -e /etc/lsb-release ] then . /etc/lsb-release if [ -n "$DISTRIB_ID" -a -n "$DISTRIB_RELEASE" ] ; then @@ -22,6 +22,9 @@ then if [ "${VERSION:3:1}" = . ] ; then VERSION=${VERSION:0:3} fi + if [ "${VERSION:0:6}" = "wheezy" ] ; then + VERSION="7.0" + fi echo "DEBIAN$SEP$VERSION" exit 0 fi diff --git a/distros/Makefile.DEBIAN_7.0 b/distros/Makefile.DEBIAN_7.0 new file mode 100644 index 0000000..b1771fa --- /dev/null +++ b/distros/Makefile.DEBIAN_7.0 @@ -0,0 +1,80 @@ +DISTRO_CODE = wheezy +BUILD_PACKAGES = +BUILD_PACKAGES += build-essential +BUILD_PACKAGES += dpatch +BUILD_PACKAGES += fping +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev +BUILD_PACKAGES += libcairo2-dev +BUILD_PACKAGES += libcloog-ppl0 # needed by libgearman +BUILD_PACKAGES += libncurses5-dev # needed by mod-gearman +BUILD_PACKAGES += libevent-dev +BUILD_PACKAGES += libgd2-xpm-dev +BUILD_PACKAGES += libglib2.0-dev +BUILD_PACKAGES += libgnutls-dev +BUILD_PACKAGES += libldap2-dev +BUILD_PACKAGES += libltdl-dev +BUILD_PACKAGES += libmcrypt-dev +BUILD_PACKAGES += libmysqlclient15-dev +BUILD_PACKAGES += libpango1.0-dev +BUILD_PACKAGES += libperl-dev +BUILD_PACKAGES += libreadline6-dev +BUILD_PACKAGES += libssl-dev +BUILD_PACKAGES += libxml2-dev +BUILD_PACKAGES += patch +BUILD_PACKAGES += python-dev +BUILD_PACKAGES += uuid-dev +BUILD_PACKAGES += snmp +BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python +BUILD_PACKAGES += apache2 # compiling mod_python +OS_PACKAGES = +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += dnsutils +OS_PACKAGES += fping +OS_PACKAGES += graphviz +OS_PACKAGES += libapache2-mod-fcgid +OS_PACKAGES += libapache2-mod-proxy-html +OS_PACKAGES += libboost-program-options1.49.0 +OS_PACKAGES += libdbi-dev +OS_PACKAGES += libevent-1.4-2 +OS_PACKAGES += libgd2-xpm +OS_PACKAGES += libltdl7 +OS_PACKAGES += libnet-snmp-perl +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.14 +OS_PACKAGES += libreadline6 +OS_PACKAGES += libsnmp-perl +OS_PACKAGES += libuuid1 +OS_PACKAGES += libpython2.6 +OS_PACKAGES += mysql-server +OS_PACKAGES += patch +OS_PACKAGES += php5 +OS_PACKAGES += php5-cgi +OS_PACKAGES += php5-cli +OS_PACKAGES += php5-gd +OS_PACKAGES += php5-mcrypt +OS_PACKAGES += php5-sqlite +OS_PACKAGES += php-pear +OS_PACKAGES += rsync +OS_PACKAGES += snmp +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +USERADD_OPTIONS = +ADD_USER_TO_GROUP = gpasswd -a %(user)s %(group)s +PACKAGE_INSTALL = aptitude -y update ; aptitude -y install +ACTIVATE_INITSCRIPT = update-rc.d %s defaults +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT = /etc/init.d/apache2 +APACHE_USER = www-data +APACHE_GROUP = www-data +APACHE_BIN = /usr/sbin/apache2 +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2/modules +APACHE_MODULE_DIR_64 = /usr/lib/apache2/modules +APACHE_FCGID_MODULE = mod_fcgid.so +APACHE_ENMOD = a2enmod %s +PHP_FCGI_BIN = /usr/bin/php5-cgi +BECOME_ROOT = su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = diff --git a/packages/mysql-omd/skel/.my.cnf b/packages/mysql-omd/skel/.my.cnf index 26897eb..acdc8cd 100644 --- a/packages/mysql-omd/skel/.my.cnf +++ b/packages/mysql-omd/skel/.my.cnf @@ -26,9 +26,11 @@ socket = ###ROOT###/tmp/run/mysqld/mysqld.sock # This was formally known as [safe_mysqld]. Both versions are currently parsed. [mysqld_safe] socket = ###ROOT###/tmp/run/mysqld/mysqld.sock +user = ###SITE### nice = 0 [mysqld] +user = ###SITE### port = 3306 # mysql does not support relative directorys From git at mathias-kettner.de Sun Jun 10 22:01:05 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 10 Jun 2012 22:01:05 +0200 Subject: [omd-commits] OMD Git: omd: Added Makefile for OPENSUSE 12.1 Message-ID: <20120610200105.2D562842E19@mail.mathias-kettner.de> Module: omd Branch: master Commit: ea35f89b851599f8c641f357a05a8927a8ae8d95 URL: http://omdistro.org/projects/omd/repository/revisions/ea35f89b851599f8c641f357a05a8927a8ae8d95 Author: Mathias Kettner Date: Sun Jun 10 22:00:59 2012 +0200 Commiter: Mathias Kettner Date: Sun Jun 10 22:00:59 2012 +0200 Added Makefile for OPENSUSE 12.1 --- distro | 17 +++++++-- distros/Makefile.OPENSUSE_12.1 | 79 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 4 deletions(-) diff --git a/distro b/distro index de0917e..b507a08 100755 --- a/distro +++ b/distro @@ -6,7 +6,7 @@ # Ubuntu is detected with /etc/lsb-release SEP=${1:- } -if [ -e /etc/lsb-release ] +if [ -e /etc/lsb-release ] then . /etc/lsb-release if [ -n "$DISTRIB_ID" -a -n "$DISTRIB_RELEASE" ] ; then @@ -22,9 +22,6 @@ then if [ "${VERSION:3:1}" = . ] ; then VERSION=${VERSION:0:3} fi - if [ "${VERSION:0:6}" = "wheezy" ] ; then - VERSION="7.0" - fi echo "DEBIAN$SEP$VERSION" exit 0 fi @@ -70,10 +67,22 @@ then then echo "SLES$SEP${VERSION}SP2" exit 0 + elif [ "$VERSION" = 10 -a "$SP" = 1 ] + then + echo "SLES$SEP${VERSION}SP1" + exit 0 + elif [ "$VERSION" = 10 -a "$SP" = 2 ] + then + echo "SLES$SEP${VERSION}SP2" + exit 0 elif [ "$VERSION" = 11 ] then echo "SLES$SEP${VERSION}" exit 0 + elif [ "$VERSION" = 12.1 ] + then + echo "OPENSUSE$SEP${VERSION}" + exit 0 fi fi diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1 new file mode 100644 index 0000000..bdf10ec --- /dev/null +++ b/distros/Makefile.OPENSUSE_12.1 @@ -0,0 +1,79 @@ +DISTRO_CODE = opensuse121 +BUILD_PACKAGES = +BUILD_PACKAGES += boost-devel +BUILD_PACKAGES += cairo-devel +BUILD_PACKAGES += fping +BUILD_PACKAGES += freetype2-devel +BUILD_PACKAGES += gcc +BUILD_PACKAGES += gcc-c++ +BUILD_PACKAGES += gd-devel +BUILD_PACKAGES += glib2-devel +BUILD_PACKAGES += libexpat-devel +BUILD_PACKAGES += libevent-devel +BUILD_PACKAGES += libgnutls-devel +BUILD_PACKAGES += libjpeg62-devel +BUILD_PACKAGES += libmcrypt-devel +BUILD_PACKAGES += libmysqlclient-devel +BUILD_PACKAGES += libopenssl-devel +BUILD_PACKAGES += libpng14-devel +BUILD_PACKAGES += libuuid-devel +BUILD_PACKAGES += libxml2-devel +BUILD_PACKAGES += make +BUILD_PACKAGES += net-snmp +BUILD_PACKAGES += openldap2-devel +BUILD_PACKAGES += pango-devel +BUILD_PACKAGES += patch +BUILD_PACKAGES += python +BUILD_PACKAGES += python-devel +BUILD_PACKAGES += readline-devel +BUILD_PACKAGES += apache2-devel +OS_PACKAGES = +OS_PACKAGES += apache2 +OS_PACKAGES += apache2-mod_fcgid +OS_PACKAGES += bind-utils +OS_PACKAGES += curl +OS_PACKAGES += dialog +OS_PACKAGES += fping +OS_PACKAGES += graphviz +OS_PACKAGES += libboost_program_options1_36_0 +OS_PACKAGES += libpng12-0 +OS_PACKAGES += libevent-1_4-2 +OS_PACKAGES += libltdl7 +OS_PACKAGES += libreadline5 +OS_PACKAGES += libuuid1 +OS_PACKAGES += mysql +OS_PACKAGES += net-snmp +OS_PACKAGES += pango +OS_PACKAGES += patch +OS_PACKAGES += perl-Net-SNMP +OS_PACKAGES += perl-SNMP +OS_PACKAGES += php5-fastcgi +OS_PACKAGES += php5-gd +OS_PACKAGES += php5-iconv +OS_PACKAGES += php5-mbstring +OS_PACKAGES += php5-mcrypt +OS_PACKAGES += php5-pear +OS_PACKAGES += php5-sockets +OS_PACKAGES += php5-sqlite +OS_PACKAGES += rsync +OS_PACKAGES += samba-client +OS_PACKAGES += unzip +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 +ACTIVATE_INITSCRIPT = chkconfig --add %s +APACHE_CONF_DIR = /etc/apache2/conf.d +APACHE_INIT = /etc/init.d/apache2 +APACHE_USER = wwwrun +APACHE_GROUP = www +APACHE_BIN = /usr/sbin/httpd2-prefork +APACHE_CTL = /usr/sbin/apache2ctl +APACHE_MODULE_DIR = /usr/lib/apache2-prefork +APACHE_MODULE_DIR_64 = /usr/lib64/apache2-prefork +APACHE_FCGID_MODULE = ../apache2/mod_fcgid.so +PHP_FCGI_BIN = /usr/bin/php-cgi +APACHE_ENMOD = a2enmod %s +BECOME_ROOT = su -c +MOUNT_OPTIONS = From git at mathias-kettner.de Sun Jun 10 22:25:52 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 10 Jun 2012 22:25:52 +0200 Subject: [omd-commits] OMD Git: omd: Added package groff to OPENSUSE build deps Message-ID: <20120610202552.CEC6F842DC0@mail.mathias-kettner.de> Module: omd Branch: master Commit: 58a6699e7f0f5900acbf9f58762246a9f4bcfc76 URL: http://omdistro.org/projects/omd/repository/revisions/58a6699e7f0f5900acbf9f58762246a9f4bcfc76 Author: Mathias Kettner Date: Sun Jun 10 22:25:48 2012 +0200 Commiter: Mathias Kettner Date: Sun Jun 10 22:25:48 2012 +0200 Added package groff to OPENSUSE build deps --- distros/Makefile.OPENSUSE_12.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1 index bdf10ec..b0d998c 100644 --- a/distros/Makefile.OPENSUSE_12.1 +++ b/distros/Makefile.OPENSUSE_12.1 @@ -27,6 +27,7 @@ BUILD_PACKAGES += python BUILD_PACKAGES += python-devel BUILD_PACKAGES += readline-devel BUILD_PACKAGES += apache2-devel +BUILD_PACKAGES += groff OS_PACKAGES = OS_PACKAGES += apache2 OS_PACKAGES += apache2-mod_fcgid From git at mathias-kettner.de Sun Jun 10 22:33:18 2012 From: git at mathias-kettner.de (git version control) Date: Sun, 10 Jun 2012 22:33:18 +0200 Subject: [omd-commits] OMD Git: omd: Added libltdl7 to build deps for OPENSUSE Message-ID: <20120610203318.76ACE842DC8@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6dd16349fcbf05243fa1d2ae0a4f10ca94f73e7b URL: http://omdistro.org/projects/omd/repository/revisions/6dd16349fcbf05243fa1d2ae0a4f10ca94f73e7b Author: Mathias Kettner Date: Sun Jun 10 22:33:15 2012 +0200 Commiter: Mathias Kettner Date: Sun Jun 10 22:33:15 2012 +0200 Added libltdl7 to build deps for OPENSUSE --- distros/Makefile.OPENSUSE_12.1 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/distros/Makefile.OPENSUSE_12.1 b/distros/Makefile.OPENSUSE_12.1 index b0d998c..3c0ba3c 100644 --- a/distros/Makefile.OPENSUSE_12.1 +++ b/distros/Makefile.OPENSUSE_12.1 @@ -18,6 +18,7 @@ BUILD_PACKAGES += libopenssl-devel BUILD_PACKAGES += libpng14-devel BUILD_PACKAGES += libuuid-devel BUILD_PACKAGES += libxml2-devel +BUILD_PACKAGES += libltdl7 BUILD_PACKAGES += make BUILD_PACKAGES += net-snmp BUILD_PACKAGES += openldap2-devel From git at mathias-kettner.de Mon Jun 11 12:46:24 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 11 Jun 2012 12:46:24 +0200 Subject: [omd-commits] OMD Git: omd: reenable changes for wheezy Message-ID: <20120611104624.612AD84287A@mail.mathias-kettner.de> Module: omd Branch: master Commit: b6b55507b429b44517bcc9c12c308c4d710b7712 URL: http://omdistro.org/projects/omd/repository/revisions/b6b55507b429b44517bcc9c12c308c4d710b7712 Author: Sven Nierlein Date: Mon Jun 11 12:45:59 2012 +0200 Commiter: Sven Nierlein Date: Mon Jun 11 12:45:59 2012 +0200 reenable changes for wheezy --- distro | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/distro b/distro index b507a08..82cd247 100755 --- a/distro +++ b/distro @@ -6,7 +6,7 @@ # Ubuntu is detected with /etc/lsb-release SEP=${1:- } -if [ -e /etc/lsb-release ] +if [ -e /etc/lsb-release ] then . /etc/lsb-release if [ -n "$DISTRIB_ID" -a -n "$DISTRIB_RELEASE" ] ; then @@ -22,6 +22,9 @@ then if [ "${VERSION:3:1}" = . ] ; then VERSION=${VERSION:0:3} fi + if [ "${VERSION:0:6}" = "wheezy" ] ; then + VERSION="7.0" + fi echo "DEBIAN$SEP$VERSION" exit 0 fi From git at mathias-kettner.de Mon Jun 18 16:29:28 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 18 Jun 2012 16:29:28 +0200 Subject: [omd-commits] OMD Git: omd: OpenSuSE: fixed one build dep Message-ID: <20120618142928.2B64C842744@mail.mathias-kettner.de> Module: omd Branch: master Commit: f80c2e9297ffcfeae26591aa53c24d3686872b79 URL: http://omdistro.org/projects/omd/repository/revisions/f80c2e9297ffcfeae26591aa53c24d3686872b79 Author: Mathias Kettner Date: Mon Jun 18 16:29:22 2012 +0200 Commiter: Mathias Kettner Date: Mon Jun 18 16:29:22 2012 +0200 OpenSuSE: fixed one build dep --- 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 3c0ba3c..a7369bd 100644 --- a/distros/Makefile.OPENSUSE_12.1 +++ b/distros/Makefile.OPENSUSE_12.1 @@ -18,8 +18,8 @@ BUILD_PACKAGES += libopenssl-devel BUILD_PACKAGES += libpng14-devel BUILD_PACKAGES += libuuid-devel BUILD_PACKAGES += libxml2-devel -BUILD_PACKAGES += libltdl7 BUILD_PACKAGES += make +BUILD_PACKAGES += libtool BUILD_PACKAGES += net-snmp BUILD_PACKAGES += openldap2-devel BUILD_PACKAGES += pango-devel From git at mathias-kettner.de Mon Jun 18 16:29:28 2012 From: git at mathias-kettner.de (git version control) Date: Mon, 18 Jun 2012 16:29:28 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20120618142928.3A3C8840822@mail.mathias-kettner.de> Module: omd Branch: master Commit: ae323d2dfd55a392efb40e5a378d7671a6c5d60d URL: http://omdistro.org/projects/omd/repository/revisions/ae323d2dfd55a392efb40e5a378d7671a6c5d60d Author: Mathias Kettner Date: Mon Jun 18 16:29:27 2012 +0200 Commiter: Mathias Kettner Date: Mon Jun 18 16:29:27 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Tue Jun 19 17:27:57 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 19 Jun 2012 17:27:57 +0200 Subject: [omd-commits] OMD Git: omd: Mod-Gearman: Update 1.3.4 Message-ID: <20120619152757.662978423F7@mail.mathias-kettner.de> Module: omd Branch: master Commit: cd6a3bdf7aca572c417368483c34c64b286bf24b URL: http://omdistro.org/projects/omd/repository/revisions/cd6a3bdf7aca572c417368483c34c64b286bf24b Author: Sven Nierlein Date: Tue Jun 19 16:51:28 2012 +0200 Commiter: Sven Nierlein Date: Tue Jun 19 16:51:28 2012 +0200 Mod-Gearman: Update 1.3.4 --- Changelog | 2 +- packages/mod-gearman/Makefile | 2 +- packages/mod-gearman/mod_gearman-1.3.2.tar.gz | Bin 304029 -> 0 bytes packages/mod-gearman/mod_gearman-1.3.4.tar.gz | Bin 0 -> 309775 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 2cbe8cd..0358692 100644 --- a/Changelog +++ b/Changelog @@ -8,7 +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.) - - Mod-Gearman: Updated to version 1.3.2 + - Mod-Gearman: Updated to version 1.3.4 - Thruk: Update to 1.32 - Icinga: Update to 1.7.0 - Check_MK: Added 1.2.0p1 release diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile index 5df9b0d..f99bf04 100644 --- a/packages/mod-gearman/Makefile +++ b/packages/mod-gearman/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mod_gearman -VERSION = 1.3.2 +VERSION = 1.3.4 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }') DIR = mod_gearman-$(VERSION) diff --git a/packages/mod-gearman/mod_gearman-1.3.2.tar.gz b/packages/mod-gearman/mod_gearman-1.3.2.tar.gz deleted file mode 100644 index 0d57923..0000000 Binary files a/packages/mod-gearman/mod_gearman-1.3.2.tar.gz and /dev/null differ diff --git a/packages/mod-gearman/mod_gearman-1.3.4.tar.gz b/packages/mod-gearman/mod_gearman-1.3.4.tar.gz new file mode 100644 index 0000000..a502ad4 Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.3.4.tar.gz differ From git at mathias-kettner.de Tue Jun 19 18:57:14 2012 From: git at mathias-kettner.de (git version control) Date: Tue, 19 Jun 2012 18:57:14 +0200 Subject: [omd-commits] OMD Git: omd: Icinga: Update to 1.7.1 Message-ID: <20120619165714.407148423F7@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7e83226dc2affffc4cccd1467ec0ecfee3737011 URL: http://omdistro.org/projects/omd/repository/revisions/7e83226dc2affffc4cccd1467ec0ecfee3737011 Author: Joerg Linge Date: Tue Jun 19 18:56:46 2012 +0200 Commiter: Joerg Linge Date: Tue Jun 19 18:56:46 2012 +0200 Icinga: Update to 1.7.1 --- Changelog | 2 +- packages/icinga/Makefile | 2 +- .../{icinga-1.7.0.tar.gz => icinga-1.7.1.tar.gz} | Bin 12939198 -> 12938365 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 0358692..ab3b1aa 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.) - Mod-Gearman: Updated to version 1.3.4 - Thruk: Update to 1.32 - - Icinga: Update to 1.7.0 + - Icinga: Update to 1.7.1 - Check_MK: Added 1.2.0p1 release - Support Ubuntu 12.04 (Precise) diff --git a/packages/icinga/Makefile b/packages/icinga/Makefile index 372470f..73d2c6f 100644 --- a/packages/icinga/Makefile +++ b/packages/icinga/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = icinga -VERSION = 1.7.0 +VERSION = 1.7.1 DIR = $(NAME)-$(VERSION) # Configure options for Icinga. Since we want to compile diff --git a/packages/icinga/icinga-1.7.0.tar.gz b/packages/icinga/icinga-1.7.1.tar.gz similarity index 60% rename from packages/icinga/icinga-1.7.0.tar.gz rename to packages/icinga/icinga-1.7.1.tar.gz index 8fdf46e..d419589 100644 Binary files a/packages/icinga/icinga-1.7.0.tar.gz and b/packages/icinga/icinga-1.7.1.tar.gz differ From git at mathias-kettner.de Wed Jun 20 11:03:45 2012 From: git at mathias-kettner.de (git version control) Date: Wed, 20 Jun 2012 11:03:45 +0200 Subject: [omd-commits] OMD Git: omd: Fixed several problems if some packages are missing Message-ID: <20120620090345.7EF5E842903@mail.mathias-kettner.de> Module: omd Branch: master Commit: eb361422050c1aae9c28aa3d942d0edd2f9681dd URL: http://omdistro.org/projects/omd/repository/revisions/eb361422050c1aae9c28aa3d942d0edd2f9681dd Author: Mathias Kettner Date: Wed Jun 20 11:03:17 2012 +0200 Commiter: Mathias Kettner Date: Wed Jun 20 11:03:17 2012 +0200 Fixed several problems if some packages are missing --- packages/omd/CORE.hook | 41 +++++++++++++++++++++++++++-------------- packages/omd/DEFAULT_GUI.hook | 10 +++++----- packages/omd/index.py | 16 +++++++++++++--- 3 files changed, 45 insertions(+), 22 deletions(-) diff --git a/packages/omd/CORE.hook b/packages/omd/CORE.hook index 29b3ef7..865363a 100755 --- a/packages/omd/CORE.hook +++ b/packages/omd/CORE.hook @@ -9,14 +9,27 @@ # as Check_MK Multisite or Thruk which can connect to other monitoring # sites via Livestatus. +# Helper function that creates a symlink only if the +# target of the link exists +make_link () +{ + if [ -e "$1" ] ; then + ln -sfn "$1" "$2" + fi +} + case "$1" in default) - echo "nagios" + if [ -e $OMD_ROOT/bin/nagios ] ; then echo "nagios" + elif [ -e $OMD_ROOT/bin/icinga ] ; then echo "icinga" + elif [ -e $OMD_ROOT/bin/shinken-arbiter ] ; then echo "shinken" + else echo "none" + fi ;; choices) - echo "nagios: Nagios" - echo "icinga: Icinga" - echo "shinken: Shinken" + [ ! -e $OMD_ROOT/bin/nagios ] || echo "nagios: Nagios" + [ ! -e $OMD_ROOT/bin/icinga ] || echo "icinga: Icinga" + [ ! -e $OMD_ROOT/bin/shinken-arbiter ] || echo "shinken: Shinken" echo "none: No monitoring core" ;; set) @@ -36,21 +49,21 @@ case "$1" in # now setup the new selection if [ "$2" == "nagios" ] then - ln -sfn ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - ln -sfn ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf - ln -sfn nagios $OMD_ROOT/etc/init.d/core + make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf + make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf + make_link nagios $OMD_ROOT/etc/init.d/core elif [ "$2" == "icinga" ] then - ln -sfn ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - ln -sfn ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf - ln -sfn icinga $OMD_ROOT/etc/init.d/core + make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf + make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf + make_link icinga $OMD_ROOT/etc/init.d/core elif [ "$2" == "shinken" ] then # Thruk is the default interface, but classic is possible - ln -sfn ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf - ln -sfn ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf - ln -sfn ../../shinken/apache.conf $OMD_ROOT/etc/apache/conf.d/shinken.conf - ln -sfn shinken $OMD_ROOT/etc/init.d/core + make_link ../../nagios/apache.conf $OMD_ROOT/etc/apache/conf.d/nagios.conf + make_link ../../icinga/apache.conf $OMD_ROOT/etc/apache/conf.d/icinga.conf + make_link ../../shinken/apache.conf $OMD_ROOT/etc/apache/conf.d/shinken.conf + make_link shinken $OMD_ROOT/etc/init.d/core else rm -f $OMD_ROOT/etc/apache/conf.d/nagios.conf rm -f $OMD_ROOT/etc/apache/conf.d/icinga.conf diff --git a/packages/omd/DEFAULT_GUI.hook b/packages/omd/DEFAULT_GUI.hook index 7821941..819bfb0 100755 --- a/packages/omd/DEFAULT_GUI.hook +++ b/packages/omd/DEFAULT_GUI.hook @@ -13,11 +13,11 @@ case "$1" in ;; choices) echo "welcome: Welcome page which lists all available GUIs" - echo "nagios: Classic Nagios webinterface" - echo "icinga: Classic Icinga webinterface" - echo "check_mk: The Check_MK's Multisite GUI" - echo "thruk: Thruk Monitoring Webinterface" - echo "nagvis: NagVis - The visualisation addon for Nagios" + [ -e $OMD_ROOT/share/nagios/htdocs ] && echo "nagios: Classic Nagios webinterface" + [ -e $OMD_ROOT/share/icinga/htdocs ] && echo "icinga: Classic Icinga webinterface" + [ -e $OMD_ROOT/share/check_mk/web ] && echo "check_mk: The Check_MK's Multisite GUI" + [ -e $OMD_ROOT/share/thruk ] && echo "thruk: Thruk Monitoring Webinterface" + [ -e $OMD_ROOT/share/nagvis ] && echo "nagvis: NagVis - The visualisation addon for Nagios" echo "none: No default webinterface" ;; set) diff --git a/packages/omd/index.py b/packages/omd/index.py index 672a952..2cc68f0 100644 --- a/packages/omd/index.py +++ b/packages/omd/index.py @@ -102,47 +102,57 @@ def page_welcome(req): the default GUI of OMD.

""" % get_version(site_name(req))) - for id, title, desc in [ ('nagios', 'Classic Nagios GUI', + for id, title, path, desc in [ ('nagios', 'Classic Nagios GUI', + 'share/nagios/htdocs', 'The classic Nagios GUI is based on CGI program written ' 'in C. It retrieves its status information from status.dat. ' 'This interface is not longer actively developed and does not perform ' 'well in large installations.'), ('check_mk', 'Check_MK Multisite', + 'share/check_mk/web', 'Check_MK Multisite is a fast and flexibile status GUI written ' 'in Python. It supports user definable views and is able to ' 'display the status of several sites in one combined view. It ' 'uses MK Livestatus for getting the status data from the sites.'), ('thruk', 'Thruk Monitoring Webinterface', + 'share/thruk', 'Thruk is a complete rework of the classic interface ' 'in Perl. While maintainig the original look and feel it ' 'brings lots of improvements and new features. Just as Multisite ' 'it uses MK Livestatus as backend and supports the visualization ' 'of multiple sites.'), ('icinga', 'Classic Icinga GUI', + 'share/icinga/htdocs', 'Icinga\'s "classical" GUI is a derivate of the classical Nagios GUI ' 'and has been directly evolved from the original ' 'CGI programs in C. It has its own look and feel and brings useful ' 'improvements. It is not bound to Icinga and can be used with the ' 'other monitoring cores as well.'), ('shinken', 'Shinken WebUI', + 'share/lib/shinken', 'Shinken enhances the ok/non-ok concept of Nagios by adding ' 'root problems and impacts. Monitored objects also can get a rank ' 'identifying their importance to the business.' 'The Shinken WebUI was designed to visualize these new concepts ' 'and can not be used with the other monitoring cores.'), - ('nagvis', 'NagVis - The visualization addon', + ('nagvis', 'NagVis - The visualization addon', + 'share/nagvis/htdocs', '

NagVis is the leading visualization addon for Nagios.

' '

NagVis can be used to visualize Nagios status data, e.g. ' 'to display IT processes like a mail system or a ' 'network infrastructure.

'), ('pnp4nagios', 'PNP4Nagios', + 'share/pnp4nagios/htdocs', 'PNP is an addon to Nagios which analyzes performance data ' 'provided by plugins and stores them automatically into ' 'RRD-databases (Round Robin Databases, see RRDTool).'), ('wiki', 'DokuWiki', + 'share/dokuwiki/htdocs', 'DokuWiki is a standards compliant, simple to use Wiki, ' 'mainly aimed at creating documentation of any kind.') ]: - req.write(""" + + if os.path.exists("/omd/sites/%s/%s" % (site_name(req), path)): + req.write("""

%s