From git at mathias-kettner.de Mon Jun 1 11:24:51 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 01 Jun 2015 11:24:51 +0200 Subject: [omd-commits] OMD Git: omd: make shinken rc script more reliable Message-ID: <20150601092451.3C33581300@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7f876678d29b057b9193a0e0847e04a94b59a742 URL: http://omdistro.org/projects/omd/repository/revisions/7f876678d29b057b9193a0e0847e04a94b59a742 Author: Sven Nierlein Date: Mon Jun 1 11:24:10 2015 +0200 Commiter: Sven Nierlein Date: Mon Jun 1 11:24:10 2015 +0200 make shinken rc script more reliable and really remove all leftover processes --- packages/shinken/skel/etc/init.d/shinken | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/shinken/skel/etc/init.d/shinken b/packages/shinken/skel/etc/init.d/shinken index fcc8943..335313c 100644 --- a/packages/shinken/skel/etc/init.d/shinken +++ b/packages/shinken/skel/etc/init.d/shinken @@ -372,6 +372,10 @@ do_stop() { else echo "OK" fi + # kill all leftovers + for cpid in $(ps -fu $OMD_SITE | grep "shinken-$mod" | grep -v grep | awk '{print $2}'); do + kill -9 $cpid > /dev/null 2>&1 + done done return 0 } From git at mathias-kettner.de Mon Jun 1 14:19:20 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 01 Jun 2015 14:19:20 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to 1.8.4 Message-ID: <20150601121920.DA46080FB0@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9cb2ef0fdc4030147603b8f661547a3dc6280c5e URL: http://omdistro.org/projects/omd/repository/revisions/9cb2ef0fdc4030147603b8f661547a3dc6280c5e Author: Lars Michelsen Date: Mon Jun 1 14:19:09 2015 +0200 Commiter: Lars Michelsen Date: Mon Jun 1 14:19:09 2015 +0200 nagvis: Updated to 1.8.4 --- Changelog | 2 +- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.8.3.tar.gz | Bin 1465440 -> 0 bytes packages/nagvis/nagvis-1.8.4.tar.gz | Bin 0 -> 1465715 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 69b05c6..a489d07 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.8.3 + - Update to version 1.8.4 - 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 2755a09..8986886 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.8.3 +VERSION = 1.8.4 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/nagvis/nagvis-1.8.3.tar.gz b/packages/nagvis/nagvis-1.8.3.tar.gz deleted file mode 100644 index 78b42f7..0000000 Binary files a/packages/nagvis/nagvis-1.8.3.tar.gz and /dev/null differ diff --git a/packages/nagvis/nagvis-1.8.4.tar.gz b/packages/nagvis/nagvis-1.8.4.tar.gz new file mode 100644 index 0000000..01ab39b Binary files /dev/null and b/packages/nagvis/nagvis-1.8.4.tar.gz differ From git at mathias-kettner.de Mon Jun 1 14:19:20 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 01 Jun 2015 14:19:20 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150601121920.ECE68808A7@mail.mathias-kettner.de> Module: omd Branch: master Commit: fdd36fa5f773fe2bc02508480216cd0491aa65bc URL: http://omdistro.org/projects/omd/repository/revisions/fdd36fa5f773fe2bc02508480216cd0491aa65bc Author: Lars Michelsen Date: Mon Jun 1 14:19:15 2015 +0200 Commiter: Lars Michelsen Date: Mon Jun 1 14:19:15 2015 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Jun 3 10:57:10 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 03 Jun 2015 10:57:10 +0200 Subject: [omd-commits] OMD Git: omd: check_logfiles: update to 3.7.1.1 Message-ID: <20150603085710.6F5358233D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 807e85e566ddbbc33623e985a1d1ce98f7d8b6cb URL: http://omdistro.org/projects/omd/repository/revisions/807e85e566ddbbc33623e985a1d1ce98f7d8b6cb Author: Gerhard Lausser Date: Wed Jun 3 10:56:29 2015 +0200 Commiter: Gerhard Lausser Date: Wed Jun 3 10:56:29 2015 +0200 check_logfiles: update to 3.7.1.1 --- packages/check_logfiles/Makefile | 2 +- packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz | Bin 0 -> 238724 bytes packages/check_logfiles/check_logfiles-3.7.1.tar.gz | Bin 233638 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_logfiles/Makefile b/packages/check_logfiles/Makefile index d678a43..cecab3f 100644 --- a/packages/check_logfiles/Makefile +++ b/packages/check_logfiles/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = check_logfiles -VERSION = 3.7.1 +VERSION = 3.7.1.1 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz b/packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz new file mode 100644 index 0000000..88e0f10 Binary files /dev/null and b/packages/check_logfiles/check_logfiles-3.7.1.1.tar.gz differ diff --git a/packages/check_logfiles/check_logfiles-3.7.1.tar.gz b/packages/check_logfiles/check_logfiles-3.7.1.tar.gz deleted file mode 100644 index c958452..0000000 Binary files a/packages/check_logfiles/check_logfiles-3.7.1.tar.gz and /dev/null differ From git at mathias-kettner.de Wed Jun 3 10:57:10 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 03 Jun 2015 10:57:10 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20150603085710.81D7F82336@mail.mathias-kettner.de> Module: omd Branch: master Commit: e9405f6015c7fa761b06497c82519b570ea3c88b URL: http://omdistro.org/projects/omd/repository/revisions/e9405f6015c7fa761b06497c82519b570ea3c88b Author: Gerhard Lausser Date: Wed Jun 3 10:56:57 2015 +0200 Commiter: Gerhard Lausser Date: Wed Jun 3 10:56:57 2015 +0200 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Thu Jun 4 09:42:27 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 04 Jun 2015 09:42:27 +0200 Subject: [omd-commits] OMD Git: omd: check_mk: Updated to 1.2.6p5 Message-ID: <20150604074227.3D95380267@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4fa3ae6145ce453754344a99543211c0e653e079 URL: http://omdistro.org/projects/omd/repository/revisions/4fa3ae6145ce453754344a99543211c0e653e079 Author: Lars Michelsen Date: Thu Jun 4 09:42:13 2015 +0200 Commiter: Lars Michelsen Date: Thu Jun 4 09:42:13 2015 +0200 check_mk: Updated to 1.2.6p5 --- Changelog | 2 +- packages/check_mk/Makefile | 2 +- .../check_mk/{check_mk-1.2.6p4.tar.gz => check_mk-1.2.6p5.tar.gz} | Bin 8038012 -> 8045879 bytes packages/check_mk/mkeventd-1.2.6p4.tar.gz | Bin 109104 -> 0 bytes packages/check_mk/mkeventd-1.2.6p5.tar.gz | Bin 0 -> 109099 bytes packages/check_mk/skel/etc/check_mk/defaults | 2 +- packages/mk-livestatus/Makefile | 2 +- packages/mk-livestatus/mk-livestatus-1.2.6p4.tar.gz | Bin 438953 -> 0 bytes packages/mk-livestatus/mk-livestatus-1.2.6p5.tar.gz | Bin 0 -> 438890 bytes 9 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index a489d07..9b1565e 100644 --- a/Changelog +++ b/Changelog @@ -48,7 +48,7 @@ This file documents the revision history for the Open Monitoring Distribution - FIX: The nagvis URLs were not correctly linking to e.g. Check_MK when a site has been created with Check_MK as default GUI - Check_MK: - - Update to 1.2.6p4 + - Update to 1.2.6p5 - moved log dir to var/log - Added build support for SLES 12 - Added build support for Ubuntu 14.10 and 15.04 diff --git a/packages/check_mk/Makefile b/packages/check_mk/Makefile index ed4081c..c866633 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.6p4 +VERSION = 1.2.6p5 DIR = $(NAME)-$(VERSION) EDIR = mkeventd-$(VERSION) diff --git a/packages/check_mk/check_mk-1.2.6p4.tar.gz b/packages/check_mk/check_mk-1.2.6p5.tar.gz similarity index 53% rename from packages/check_mk/check_mk-1.2.6p4.tar.gz rename to packages/check_mk/check_mk-1.2.6p5.tar.gz index 522d801..28f0711 100644 Binary files a/packages/check_mk/check_mk-1.2.6p4.tar.gz and b/packages/check_mk/check_mk-1.2.6p5.tar.gz differ diff --git a/packages/check_mk/mkeventd-1.2.6p4.tar.gz b/packages/check_mk/mkeventd-1.2.6p4.tar.gz deleted file mode 100644 index d1e5c46..0000000 Binary files a/packages/check_mk/mkeventd-1.2.6p4.tar.gz and /dev/null differ diff --git a/packages/check_mk/mkeventd-1.2.6p5.tar.gz b/packages/check_mk/mkeventd-1.2.6p5.tar.gz new file mode 100644 index 0000000..d0773c2 Binary files /dev/null and b/packages/check_mk/mkeventd-1.2.6p5.tar.gz differ diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults index 3835d1a..ed9bdbf 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.6p4' +check_mk_version = '1.2.6p5' 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 6f619d1..0681f2e 100644 --- a/packages/mk-livestatus/Makefile +++ b/packages/mk-livestatus/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = mk-livestatus -VERSION = 1.2.6p4 +VERSION = 1.2.6p5 DIR = $(NAME)-$(VERSION) CONFIGUREOPTS = \ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.6p4.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.6p4.tar.gz deleted file mode 100644 index 645bb64..0000000 Binary files a/packages/mk-livestatus/mk-livestatus-1.2.6p4.tar.gz and /dev/null differ diff --git a/packages/mk-livestatus/mk-livestatus-1.2.6p5.tar.gz b/packages/mk-livestatus/mk-livestatus-1.2.6p5.tar.gz new file mode 100644 index 0000000..38e6c0e Binary files /dev/null and b/packages/mk-livestatus/mk-livestatus-1.2.6p5.tar.gz differ From git at mathias-kettner.de Sun Jun 7 14:07:34 2015 From: git at mathias-kettner.de (git version control) Date: Sun, 07 Jun 2015 14:07:34 +0200 Subject: [omd-commits] OMD Git: omd: debian: use major version only Message-ID: <20150607120734.723428228A@mail.mathias-kettner.de> Module: omd Branch: master Commit: e3ffbb8ed5c50a6a5d8423bdce57b0c35b392a08 URL: http://omdistro.org/projects/omd/repository/revisions/e3ffbb8ed5c50a6a5d8423bdce57b0c35b392a08 Author: Sven Nierlein Date: Sun Jun 7 14:04:45 2015 +0200 Commiter: Sven Nierlein Date: Sun Jun 7 14:07:23 2015 +0200 debian: use major version only this is already the case and instead of creating symlinks for all minor versions, just use the major version only. --- distro | 6 +++--- distros/{Makefile.DEBIAN_5.0 => Makefile.DEBIAN_5} | 0 distros/{Makefile.DEBIAN_6.0 => Makefile.DEBIAN_6} | 0 distros/{Makefile.DEBIAN_7.0 => Makefile.DEBIAN_7} | 0 distros/{Makefile.DEBIAN_8.0 => Makefile.DEBIAN_8} | 0 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/distro b/distro index 5449980..d0a3e6a 100755 --- a/distro +++ b/distro @@ -15,12 +15,12 @@ then fi fi -# Debian: We drop the last version: 5.0.4 -> 5.0 +# Debian: We drop the last two versions: 5.0.4 -> 5 if [ -e /etc/debian_version ] then VERSION=$(cat /etc/debian_version) - if [ "${VERSION:3:1}" = . ] ; then - VERSION=${VERSION:0:3} + if [ "${VERSION:1:1}" = . ] ; then + VERSION=${VERSION:0:1} fi if [ "${VERSION:0:6}" = "wheezy" ] ; then VERSION="7.0" diff --git a/distros/Makefile.DEBIAN_5.0 b/distros/Makefile.DEBIAN_5 similarity index 100% rename from distros/Makefile.DEBIAN_5.0 rename to distros/Makefile.DEBIAN_5 diff --git a/distros/Makefile.DEBIAN_6.0 b/distros/Makefile.DEBIAN_6 similarity index 100% rename from distros/Makefile.DEBIAN_6.0 rename to distros/Makefile.DEBIAN_6 diff --git a/distros/Makefile.DEBIAN_7.0 b/distros/Makefile.DEBIAN_7 similarity index 100% rename from distros/Makefile.DEBIAN_7.0 rename to distros/Makefile.DEBIAN_7 diff --git a/distros/Makefile.DEBIAN_8.0 b/distros/Makefile.DEBIAN_8 similarity index 100% rename from distros/Makefile.DEBIAN_8.0 rename to distros/Makefile.DEBIAN_8 From git at mathias-kettner.de Mon Jun 8 17:21:55 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 08 Jun 2015 17:21:55 +0200 Subject: [omd-commits] OMD Git: omd: fix build pkg names for ubuntu15.04 Message-ID: <20150608152155.559C883C5F@mail.mathias-kettner.de> Module: omd Branch: master Commit: c6b224567ae64e1bca1e03fc23e406b8c01f34d7 URL: http://omdistro.org/projects/omd/repository/revisions/c6b224567ae64e1bca1e03fc23e406b8c01f34d7 Author: Sven Nierlein Date: Mon Jun 8 15:07:38 2015 +0200 Commiter: Sven Nierlein Date: Mon Jun 8 15:07:38 2015 +0200 fix build pkg names for ubuntu15.04 --- distros/Makefile.UBUNTU_15.04 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/distros/Makefile.UBUNTU_15.04 b/distros/Makefile.UBUNTU_15.04 index 9b44ada..1349706 100644 --- a/distros/Makefile.UBUNTU_15.04 +++ b/distros/Makefile.UBUNTU_15.04 @@ -4,8 +4,10 @@ BUILD_PACKAGES += build-essential BUILD_PACKAGES += devscripts BUILD_PACKAGES += dpatch BUILD_PACKAGES += dnsutils +BUILD_PACKAGES += fping BUILD_PACKAGES += smbclient # otherwise missing path in util.pm -BUILD_PACKAGES += libboost-dev +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev BUILD_PACKAGES += libcloog-ppl1 BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk BUILD_PACKAGES += libevent-dev @@ -14,6 +16,7 @@ BUILD_PACKAGES += libglib2.0-dev BUILD_PACKAGES += libgnutls-dev BUILD_PACKAGES += libldap2-dev BUILD_PACKAGES += libltdl-dev +BUILD_PACKAGES += libmcrypt-dev BUILD_PACKAGES += libmysqlclient-dev BUILD_PACKAGES += libpq-dev BUILD_PACKAGES += libpango1.0-dev @@ -40,13 +43,14 @@ OS_PACKAGES += libsnmp-python # needed for Check_MK inline SNMP 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 += apache2-mpm-prefork # Multisite/mod_python crashes with mpm-worker! OS_PACKAGES += apache2-utils # contains htpasswd2 -OS_PACKAGES += libboost-program-options1.54.0 -OS_PACKAGES += libboost-system1.54.0 +OS_PACKAGES += libboost-program-options1.55.0 +OS_PACKAGES += libboost-system1.55.0 OS_PACKAGES += libdbi1 OS_PACKAGES += libevent-1.4-2 OS_PACKAGES += libltdl7 From git at mathias-kettner.de Tue Jun 9 10:55:10 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 09 Jun 2015 10:55:10 +0200 Subject: [omd-commits] OMD Git: omd: distro: fix removing .0 for wheezy and jessie Message-ID: <20150609085510.24F8A8200A@mail.mathias-kettner.de> Module: omd Branch: master Commit: fb30874a4facf84e340a1591b53af57f27fc64a6 URL: http://omdistro.org/projects/omd/repository/revisions/fb30874a4facf84e340a1591b53af57f27fc64a6 Author: Mathias Kettner Date: Tue Jun 9 10:55:08 2015 +0200 Commiter: Mathias Kettner Date: Tue Jun 9 10:55:08 2015 +0200 distro: fix removing .0 for wheezy and jessie --- distro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distro b/distro index d0a3e6a..c34d2b3 100755 --- a/distro +++ b/distro @@ -23,10 +23,10 @@ then VERSION=${VERSION:0:1} fi if [ "${VERSION:0:6}" = "wheezy" ] ; then - VERSION="7.0" + VERSION="7" fi if [ "${VERSION:0:6}" = "jessie" ] ; then - VERSION="8.0" + VERSION="8" fi echo "DEBIAN$SEP$VERSION" exit 0 From git at mathias-kettner.de Tue Jun 9 16:19:15 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 09 Jun 2015 16:19:15 +0200 Subject: [omd-commits] OMD Git: omd: Fix missing directories after doing omd cp -N Message-ID: <20150609141915.C54E3808BF@mail.mathias-kettner.de> Module: omd Branch: master Commit: b95431c8c41dfd29685add4eb148563fa9305107 URL: http://omdistro.org/projects/omd/repository/revisions/b95431c8c41dfd29685add4eb148563fa9305107 Author: Mathias Kettner Date: Tue Jun 9 16:19:11 2015 +0200 Commiter: Mathias Kettner Date: Tue Jun 9 16:19:11 2015 +0200 Fix missing directories after doing omd cp -N --- packages/omd/omd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/omd/omd b/packages/omd/omd index 706de04..ddcff73 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2769,19 +2769,19 @@ def main_mv_or_cp(what, args, options={}): addopts = "" excludes = [] if "no-rrds" in options or "no-past" in options: - excludes.append("var/pnp4nagios/perfdata/") - excludes.append("var/pnp4nagios/spool/") - excludes.append("var/rrdcached/") - excludes.append("var/pnp4nagios/states/") + excludes.append("var/pnp4nagios/perfdata/*") + excludes.append("var/pnp4nagios/spool/*") + excludes.append("var/rrdcached/*") + excludes.append("var/pnp4nagios/states/*") if "no-logs" in options or "no-past" in options: - excludes.append("var/log/*/") + excludes.append("var/log/*/*") excludes.append("var/nagios/nagios.log") excludes.append("var/nagios/archive/") - excludes.append("var/pnp4nagios/log/") + excludes.append("var/pnp4nagios/log/*") excludes.append("var/pnp4nagios/perfdata.dump") - excludes.append("var/mkeventd/history/") + excludes.append("var/mkeventd/history/*") excludes.append("var/check_mk/core/history") - excludes.append("var/check_mk/core/archive/") + excludes.append("var/check_mk/core/archive/*") for p in excludes: addopts += " --exclude '/%s'" % p From git at mathias-kettner.de Thu Jun 11 16:30:30 2015 From: git at mathias-kettner.de (git version control) Date: Thu, 11 Jun 2015 16:30:30 +0200 Subject: [omd-commits] OMD Git: omd: thruks postinst script requires tmpfs Message-ID: <20150611143030.603DD82335@mail.mathias-kettner.de> Module: omd Branch: master Commit: 6761e9506eb09bf979fd77a1f21d6aa2d82e8cbc URL: http://omdistro.org/projects/omd/repository/revisions/6761e9506eb09bf979fd77a1f21d6aa2d82e8cbc Author: Sven Nierlein Date: Thu Jun 11 16:28:47 2015 +0200 Commiter: Sven Nierlein Date: Thu Jun 11 16:28:47 2015 +0200 thruks postinst script requires tmpfs since there is no omd mount, just invoke a random omd start cmd. --- packages/thruk/thruk.post-update | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/thruk/thruk.post-update b/packages/thruk/thruk.post-update index ba9cec6..2f6a1b7 100755 --- a/packages/thruk/thruk.post-update +++ b/packages/thruk/thruk.post-update @@ -2,6 +2,7 @@ cd $OMD_ROOT if [ -s etc/cron.d/thruk.auto ]; then + omd start nonexistant >/dev/null 2>&1 # hack to mount tmp filesystem since there is no omd mount (yet?) newversion=$(basename $(readlink version)) sed -i etc/cron.d/thruk.auto -e "s|/omd/versions/[0-9\.]*/|/omd/versions/$newversion/|g" || echo "Updating Thruk Jobs Failed" ./bin/thruk -a installcron > /dev/null From git at mathias-kettner.de Fri Jun 12 10:18:54 2015 From: git at mathias-kettner.de (git version control) Date: Fri, 12 Jun 2015 10:18:54 +0200 Subject: [omd-commits] OMD Git: omd: fixed thruk logrotate.conf permissions to match skel.permissions Message-ID: <20150612081854.D86F581FB1@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0499f13ac2f8e3c1bdf4fe59c8309917d91df438 URL: http://omdistro.org/projects/omd/repository/revisions/0499f13ac2f8e3c1bdf4fe59c8309917d91df438 Author: Raphael Hoegger Date: Fri Jun 12 09:57:56 2015 +0200 Commiter: Sven Nierlein Date: Fri Jun 12 10:18:27 2015 +0200 fixed thruk logrotate.conf permissions to match skel.permissions Signed-off-by: Sven Nierlein --- packages/thruk/skel/etc/logrotate.d/thruk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/thruk/skel/etc/logrotate.d/thruk b/packages/thruk/skel/etc/logrotate.d/thruk index f06a48f..3cdb094 100644 --- a/packages/thruk/skel/etc/logrotate.d/thruk +++ b/packages/thruk/skel/etc/logrotate.d/thruk @@ -4,5 +4,5 @@ compress delaycompress notifempty - create 640 ###SITE### ###SITE### + create 660 ###SITE### ###SITE### } From git at mathias-kettner.de Wed Jun 17 17:46:25 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 17 Jun 2015 17:46:25 +0200 Subject: [omd-commits] OMD Git: omd: Update dokuwiki to 2014-09-29d Message-ID: <20150617154625.E9E618054F@mail.mathias-kettner.de> Module: omd Branch: master Commit: b10558c1e6e9f049b3da60491d431513f167142e URL: http://omdistro.org/projects/omd/repository/revisions/b10558c1e6e9f049b3da60491d431513f167142e Author: Matthias Gallinger Date: Tue Apr 21 15:01:06 2015 +0200 Commiter: Sven Nierlein Date: Wed Jun 17 16:49:47 2015 +0200 Update dokuwiki to 2014-09-29d Signed-off-by: Sven Nierlein --- packages/dokuwiki/Makefile | 31 ++- packages/dokuwiki/dokuwiki-2013-05-10a.tgz | Bin 2961725 -> 0 bytes packages/dokuwiki/dokuwiki-2014-09-29d.tgz | Bin 0 -> 2466441 bytes packages/dokuwiki/patches/0001-style.patch | 4 +- packages/dokuwiki/patches/0002-pdflink.patch | 4 +- .../dokuwiki/patches/0010-acl.auth.php.skel_patch | 9 + packages/dokuwiki/plugin-bookcreator.tgz | Bin 29868 -> 34986 bytes packages/dokuwiki/plugin-dw2pdf.tgz | Bin 9895309 -> 9835401 bytes packages/dokuwiki/plugin-include.tgz | Bin 37277 -> 40132 bytes packages/dokuwiki/skel/etc/dokuwiki/.htaccess | 3 - packages/dokuwiki/skel/etc/dokuwiki/acl.auth.php | 3 - .../dokuwiki/skel/etc/dokuwiki/acl.auth.php.dist | 21 -- packages/dokuwiki/skel/etc/dokuwiki/acronyms.conf | 61 ----- packages/dokuwiki/skel/etc/dokuwiki/apache.conf | 13 +- packages/dokuwiki/skel/etc/dokuwiki/dokuwiki.php | 177 -------------- packages/dokuwiki/skel/etc/dokuwiki/entities.conf | 22 -- packages/dokuwiki/skel/etc/dokuwiki/interwiki.conf | 131 ---------- packages/dokuwiki/skel/etc/dokuwiki/license.php | 36 --- packages/dokuwiki/skel/etc/dokuwiki/local.php.dist | 16 -- packages/dokuwiki/skel/etc/dokuwiki/mediameta.php | 91 ------- packages/dokuwiki/skel/etc/dokuwiki/mime.conf | 65 ----- .../skel/etc/dokuwiki/mysql.conf.php.example | 253 -------------------- .../dokuwiki/skel/etc/dokuwiki/plugins.local.php | 12 + packages/dokuwiki/skel/etc/dokuwiki/plugins.php | 6 - .../skel/etc/dokuwiki/plugins.required.php | 11 - packages/dokuwiki/skel/etc/dokuwiki/scheme.conf | 11 - packages/dokuwiki/skel/etc/dokuwiki/smileys.conf | 28 --- .../dokuwiki/skel/etc/dokuwiki/users.auth.php.dist | 10 - packages/dokuwiki/skel/etc/dokuwiki/wordblock.conf | 32 --- .../dokuwiki/skel/etc/dokuwiki/words.aspell.dist | 5 - packages/dokuwiki/template-vector.tgz | Bin 162330 -> 159065 bytes 31 files changed, 58 insertions(+), 997 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=b10558c1e6e9f049b3da60491d431513f167142e From git at mathias-kettner.de Wed Jun 17 17:46:25 2015 From: git at mathias-kettner.de (git version control) Date: Wed, 17 Jun 2015 17:46:25 +0200 Subject: [omd-commits] OMD Git: omd: update changelog Message-ID: <20150617154626.06C81804D8@mail.mathias-kettner.de> Module: omd Branch: master Commit: d99074590a7ca194a2f64d7aa43206daf2676350 URL: http://omdistro.org/projects/omd/repository/revisions/d99074590a7ca194a2f64d7aa43206daf2676350 Author: Sven Nierlein Date: Wed Jun 17 16:53:14 2015 +0200 Commiter: Sven Nierlein Date: Wed Jun 17 16:53:14 2015 +0200 update changelog --- Changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 9b1565e..fcb041b 100644 --- a/Changelog +++ b/Changelog @@ -65,6 +65,9 @@ This file documents the revision history for the Open Monitoring Distribution - apache: - mod_fcgid: update to 2.3.9, sles 11 and centos 5/6 only - set graceful restart timeout + - Dokuwiki + - Updated to Version 2014-09-29d + - fix discarding all local settings on update 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping From git at mathias-kettner.de Tue Jun 23 13:39:21 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 23 Jun 2015 13:39:21 +0200 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20150623113921.1D052800AE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7dd930703f4b44ae94b4b078d76810677a700cd4 URL: http://omdistro.org/projects/omd/repository/revisions/7dd930703f4b44ae94b4b078d76810677a700cd4 Author: Mathias Kettner Date: Tue Jun 23 13:39:18 2015 +0200 Commiter: Mathias Kettner Date: Tue Jun 23 13:39:18 2015 +0200 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Tue Jun 23 13:39:21 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 23 Jun 2015 13:39:21 +0200 Subject: [omd-commits] OMD Git: omd: Enable host freshness checking per default Message-ID: <20150623113921.2A30580078@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1596c39a70de8e9e29da880394f60b24d871d900 URL: http://omdistro.org/projects/omd/repository/revisions/1596c39a70de8e9e29da880394f60b24d871d900 Author: Mathias Kettner Date: Tue Jun 23 13:39:12 2015 +0200 Commiter: Mathias Kettner Date: Tue Jun 23 13:39:12 2015 +0200 Enable host freshness checking per default --- packages/nagios/skel/etc/nagios/nagios.d/freshness.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nagios/skel/etc/nagios/nagios.d/freshness.cfg b/packages/nagios/skel/etc/nagios/nagios.d/freshness.cfg index f43c529..c5fa11a 100644 --- a/packages/nagios/skel/etc/nagios/nagios.d/freshness.cfg +++ b/packages/nagios/skel/etc/nagios/nagios.d/freshness.cfg @@ -71,7 +71,7 @@ service_freshness_check_interval=60 # manner. # Values: 1 = enabled freshness checking, 0 = disable freshness checking -check_host_freshness=0 +check_host_freshness=1 From git at mathias-kettner.de Mon Jun 29 16:18:29 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 29 Jun 2015 16:18:29 +0200 Subject: [omd-commits] OMD Git: omd: Updated changelog Message-ID: <20150629141829.B0BB7809F3@mail.mathias-kettner.de> Module: omd Branch: master Commit: ddb8280b25bb663b4808f40588dfbc56b930218c URL: http://omdistro.org/projects/omd/repository/revisions/ddb8280b25bb663b4808f40588dfbc56b930218c Author: Lars Michelsen Date: Mon Jun 29 16:16:59 2015 +0200 Commiter: Lars Michelsen Date: Mon Jun 29 16:16:59 2015 +0200 Updated changelog --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index fcb041b..506a754 100644 --- a/Changelog +++ b/Changelog @@ -47,6 +47,8 @@ This file documents the revision history for the Open Monitoring Distribution about these files manually. - FIX: The nagvis URLs were not correctly linking to e.g. Check_MK when a site has been created with Check_MK as default GUI + - FIX: Fixed site not starting after "omd cp" when using + the arguments --no-past, --no-rrds or --no-logs - Check_MK: - Update to 1.2.6p5 - moved log dir to var/log From git at mathias-kettner.de Mon Jun 29 16:18:29 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 29 Jun 2015 16:18:29 +0200 Subject: [omd-commits] OMD Git: omd: Create missing directorys when omd cp is used with --no-* opts Message-ID: <20150629141829.BD199808F4@mail.mathias-kettner.de> Module: omd Branch: master Commit: 79dead2bc5280c951cb3325e159c8a689d2b1460 URL: http://omdistro.org/projects/omd/repository/revisions/79dead2bc5280c951cb3325e159c8a689d2b1460 Author: Matthias Haehnel Date: Tue Mar 31 16:09:57 2015 +0200 Commiter: Lars Michelsen Date: Mon Jun 29 16:15:24 2015 +0200 Create missing directorys when omd cp is used with --no-* opts --- packages/omd/omd | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/omd/omd b/packages/omd/omd index ddcff73..0e42582 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2792,6 +2792,15 @@ def main_mv_or_cp(what, args, options={}): os.system("rsync -arx %s '%s/' '%s/'" % (addopts, site_dir(g_sitename), site_dir(new))) + httpdlogdir = site_dir(new) + "/var/log/apache" + if not os.path.exists(httpdlogdir): + os.mkdir(httpdlogdir) + + rrdcacheddir = site_dir(new) + "/var/rrdcached" + if not os.path.exists(rrdcacheddir): + os.mkdir(rrdcacheddir) + + # give new user all files chown_tree(site_dir(new), new) From git at mathias-kettner.de Mon Jun 29 16:18:29 2015 From: git at mathias-kettner.de (git version control) Date: Mon, 29 Jun 2015 16:18:29 +0200 Subject: [omd-commits] OMD Git: omd: nagvis: Fixed handing of old NAGVIS_URLS=auto config setting Message-ID: <20150629141829.C354C80811@mail.mathias-kettner.de> Module: omd Branch: master Commit: fe64efc071e32f6011e08dca5fd61ee7fb7a9b97 URL: http://omdistro.org/projects/omd/repository/revisions/fe64efc071e32f6011e08dca5fd61ee7fb7a9b97 Author: Lars Michelsen Date: Mon Jun 29 16:18:25 2015 +0200 Commiter: Lars Michelsen Date: Mon Jun 29 16:18:25 2015 +0200 nagvis: Fixed handing of old NAGVIS_URLS=auto config setting --- packages/nagvis/NAGVIS_URLS.hook | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/nagvis/NAGVIS_URLS.hook b/packages/nagvis/NAGVIS_URLS.hook index 2d48325..58c6e80 100755 --- a/packages/nagvis/NAGVIS_URLS.hook +++ b/packages/nagvis/NAGVIS_URLS.hook @@ -10,14 +10,6 @@ # Makes it possible to switch all the links from NagVis # to the default Web GUI to the choosen GUI or a defined # other one. -# -# Idea: Default mode is "auto". In this mode the HOOK -# checks the current configuration for the default -# web gui and sets the NagVis links to point to it. -# It is also possible to force the other Web GUIs instead -# of "auto". -# Another option is "none". In this case OMD configures -# nothing and NagVis uses the hard coded optionsa case "$1" in default) @@ -38,13 +30,22 @@ case "$1" in CFG_FILE=$OMD_ROOT/etc/nagvis/conf.d/urls.ini.php GUI=$2 - # Fallback to classic Nagios GUI when auto mode and unhandled GUIs selected - # (welcome/nagvis GUIs are catched in DEFAULT_GUI hook) - if [ "$GUI" == "none" ] && [ -f $CFG_FILE ]; then - rm $CFG_FILE + # When a user sets NAGVIS_URL to "none", previous config files are + # deleted and the hook finishes. NagVis will use it's defaults or the + # configuration which has been made in the NagVis configuration manually. + if [ "$GUI" == "none" ]; then + if [ -f $CFG_FILE ]; then + rm $CFG_FILE + fi exit 0 fi + # Previous OMD versions offered the option "auto", which is not possible + # anymore. Behave like the default value has been selected. + if [ "$GUI" == "auto" ]; then + GUI=nagios + fi + if [ ! -d $OMD_ROOT/etc/nagvis/conf.d ]; then mkdir -p $OMD_ROOT/etc/nagvis/conf.d fi From git at mathias-kettner.de Tue Jun 30 12:09:41 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 30 Jun 2015 12:09:41 +0200 Subject: [omd-commits] OMD Git: omd: Simplified regex a bit Message-ID: <20150630100941.355BE801AA@mail.mathias-kettner.de> Module: omd Branch: master Commit: 76657419667da1e10baab1cebd7c159747ef6fb5 URL: http://omdistro.org/projects/omd/repository/revisions/76657419667da1e10baab1cebd7c159747ef6fb5 Author: Lars Michelsen Date: Tue Jun 30 12:09:36 2015 +0200 Commiter: Lars Michelsen Date: Tue Jun 30 12:09:36 2015 +0200 Simplified regex a bit --- packages/omd/skel/etc/apache/conf.d/omd.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/omd/skel/etc/apache/conf.d/omd.conf b/packages/omd/skel/etc/apache/conf.d/omd.conf index 116115a..18f715e 100644 --- a/packages/omd/skel/etc/apache/conf.d/omd.conf +++ b/packages/omd/skel/etc/apache/conf.d/omd.conf @@ -5,13 +5,13 @@ Alias /###SITE###/omd "###ROOT###/share/omd/htdocs" # First detect if HTTP/HTTPS is used and set it as environment variable # to make the redirects possible. Then redirect the base URLs RewriteEngine On -RewriteRule ^/###SITE###(/?)$ - [env=proto:http] +RewriteRule ^/###SITE###/?$ - [env=proto:http] RewriteCond %{HTTP:X-Forwarded-Proto} =https [OR] RewriteCond %{HTTPS} =on -RewriteRule ^/###SITE###(/?)$ - [env=proto:https] +RewriteRule ^/###SITE###/?$ - [env=proto:https] -RewriteRule ^/###SITE###(/?)$ %{ENV:proto}://%{SERVER_NAME}/###SITE###/omd/ [R=302,L] +RewriteRule ^/###SITE###/?$ %{ENV:proto}://%{SERVER_NAME}/###SITE###/omd/ [R=302,L] From git at mathias-kettner.de Tue Jun 30 12:09:41 2015 From: git at mathias-kettner.de (git version control) Date: Tue, 30 Jun 2015 12:09:41 +0200 Subject: [omd-commits] OMD Git: omd: Base URL redirects preserve https protocols now Message-ID: <20150630100941.4A8688019D@mail.mathias-kettner.de> Module: omd Branch: master Commit: 96de198f35794c36ba666daa0dd12e004e16490d URL: http://omdistro.org/projects/omd/repository/revisions/96de198f35794c36ba666daa0dd12e004e16490d Author: Lars Michelsen Date: Tue Jun 30 12:07:45 2015 +0200 Commiter: Lars Michelsen Date: Tue Jun 30 12:07:45 2015 +0200 Base URL redirects preserve https protocols now Default redirects from /[site] and /[site]/ to /[site]/omd/ are are now preserving the original requested protocol (http/https). When using the apache shared mode (which is the default), having the system apache service the pages via HTTPS, you will need to configure the system apache to provide the X-Forwarded-Proto request header to the site apache, which can be done by adding the line 'RequestHeader set X-Forwarded-Proto "https"' to the proxy configuration related to the site. --- Changelog | 8 ++++++++ packages/omd/skel/etc/apache/conf.d/omd.conf | 15 +++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 506a754..c4c5d66 100644 --- a/Changelog +++ b/Changelog @@ -67,6 +67,14 @@ This file documents the revision history for the Open Monitoring Distribution - apache: - mod_fcgid: update to 2.3.9, sles 11 and centos 5/6 only - set graceful restart timeout + - Default redirects from /[site] and /[site]/ to /[site]/omd/ are + are now preserving the original requested protocol (http/https). + When using the apache shared mode (which is the default), having + the system apache service the pages via HTTPS, you will need to + configure the system apache to provide the X-Forwarded-Proto + request header to the site apache, which can be done by + adding the line 'RequestHeader set X-Forwarded-Proto "https"' to + the proxy configuration related to the site. - Dokuwiki - Updated to Version 2014-09-29d - fix discarding all local settings on update diff --git a/packages/omd/skel/etc/apache/conf.d/omd.conf b/packages/omd/skel/etc/apache/conf.d/omd.conf index d213e91..116115a 100644 --- a/packages/omd/skel/etc/apache/conf.d/omd.conf +++ b/packages/omd/skel/etc/apache/conf.d/omd.conf @@ -1,6 +1,17 @@ Alias /###SITE###/omd "###ROOT###/share/omd/htdocs" -RedirectMatch ^/###SITE###$ /###SITE###/omd/ -RedirectMatch ^/###SITE###/$ /###SITE###/omd/ + +# Realize a redirect from /site and /site/ to the /site/omd/ default +# page while keeping the protocol specified by the user intact. +# First detect if HTTP/HTTPS is used and set it as environment variable +# to make the redirects possible. Then redirect the base URLs +RewriteEngine On +RewriteRule ^/###SITE###(/?)$ - [env=proto:http] + +RewriteCond %{HTTP:X-Forwarded-Proto} =https [OR] +RewriteCond %{HTTPS} =on +RewriteRule ^/###SITE###(/?)$ - [env=proto:https] + +RewriteRule ^/###SITE###(/?)$ %{ENV:proto}://%{SERVER_NAME}/###SITE###/omd/ [R=302,L]