From git at mathias-kettner.de Mon Nov 3 16:14:50 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 03 Nov 2014 16:14:50 +0100 Subject: [omd-commits] OMD Git: omd: Implemented methods for complete backup, restore and cross server migration of OMD sites Message-ID: <20141103151450.A4077806ED@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9363ca5f591d1b9f75b9d8e6862366c3776cef36 URL: http://omdistro.org/projects/omd/repository/revisions/9363ca5f591d1b9f75b9d8e6862366c3776cef36 Author: Lars Michelsen Date: Mon Nov 3 16:14:46 2014 +0100 Commiter: Lars Michelsen Date: Mon Nov 3 16:14:46 2014 +0100 Implemented methods for complete backup, restore and cross server migration of OMD sites --- Changelog | 17 +++++ packages/omd/omd | 187 ++++++++++++++++++++++++++++++++++++++++++++++++---- packages/omd/omd.8 | 42 ++++++++++++ 3 files changed, 233 insertions(+), 13 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=9363ca5f591d1b9f75b9d8e6862366c3776cef36 From git at mathias-kettner.de Tue Nov 11 16:19:15 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 11 Nov 2014 16:19:15 +0100 Subject: [omd-commits] OMD Git: omd: omd backup destination file now relative to workdir Message-ID: <20141111151915.31997807E6@mail.mathias-kettner.de> Module: omd Branch: master Commit: 9774bbd04f2f76c11419655757e9a2169ece1d6d URL: http://omdistro.org/projects/omd/repository/revisions/9774bbd04f2f76c11419655757e9a2169ece1d6d Author: Lars Michelsen Date: Tue Nov 11 16:19:11 2014 +0100 Commiter: Lars Michelsen Date: Tue Nov 11 16:19:11 2014 +0100 omd backup destination file now relative to workdir --- packages/omd/omd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/omd/omd b/packages/omd/omd index ce4e0f5..b3a0b2e 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2951,6 +2951,8 @@ def main_backup(args, options={}): if dest == '-': fh = sys.stdout else: + if dest[0] != '/': + dest = g_orig_wd + '/' + dest fh = file(dest, 'w') tar = tarfile.open(fileobj=fh, mode='w:gz') @@ -3450,6 +3452,7 @@ read_info() # site user should always run with site user priviledges. That way # we are sure that new files and processes are created under the # site user and never as root. +g_orig_wd = os.getcwd() if g_sitename and os.getuid() == 0 and not only_root: switch_to_site_user() From git at mathias-kettner.de Wed Nov 12 10:27:41 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 12 Nov 2014 10:27:41 +0100 Subject: [omd-commits] OMD Git: omd: Added missing build dependency for sles12 Message-ID: <20141112092741.78B37807E7@mail.mathias-kettner.de> Module: omd Branch: master Commit: e04c62496660d2ec0a13dfe6be61d4ee60dd727a URL: http://omdistro.org/projects/omd/repository/revisions/e04c62496660d2ec0a13dfe6be61d4ee60dd727a Author: Lars Michelsen Date: Wed Nov 12 10:16:56 2014 +0100 Commiter: Lars Michelsen Date: Wed Nov 12 10:16:56 2014 +0100 Added missing build dependency for sles12 --- distros/Makefile.SLES_12 | 1 + 1 file changed, 1 insertion(+) diff --git a/distros/Makefile.SLES_12 b/distros/Makefile.SLES_12 index a183179..15d0f39 100644 --- a/distros/Makefile.SLES_12 +++ b/distros/Makefile.SLES_12 @@ -5,6 +5,7 @@ BUILD_PACKAGES += rpm-devel # needed for "make rpm" BUILD_PACKAGES += unzip # unpack src files of packages BUILD_PACKAGES += groff # needed for building rrdtool BUILD_PACKAGES += libltdl7 # needed for gearman +BUILD_PACKAGES += libtool # needed for gearman BUILD_PACKAGES += boost-devel BUILD_PACKAGES += cairo-devel BUILD_PACKAGES += fping From git at mathias-kettner.de Wed Nov 12 11:19:54 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 12 Nov 2014 11:19:54 +0100 Subject: [omd-commits] OMD Git: omd: debian8: rename libgnutls dev dependency Message-ID: <20141112101954.C5960807DB@mail.mathias-kettner.de> Module: omd Branch: master Commit: c0f204607b82f5c0f0f57c0e3d78263f574f4235 URL: http://omdistro.org/projects/omd/repository/revisions/c0f204607b82f5c0f0f57c0e3d78263f574f4235 Author: Sven Nierlein Date: Mon Nov 10 17:55:39 2014 +0100 Commiter: Sven Nierlein Date: Wed Nov 12 11:19:42 2014 +0100 debian8: rename libgnutls dev dependency gnutls26 has been replaced with gnutls28 which comes with a new package name: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767610 Signed-off-by: Sven Nierlein --- distros/Makefile.DEBIAN_8.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/Makefile.DEBIAN_8.0 b/distros/Makefile.DEBIAN_8.0 index d4f685a..9f08f44 100644 --- a/distros/Makefile.DEBIAN_8.0 +++ b/distros/Makefile.DEBIAN_8.0 @@ -14,7 +14,7 @@ BUILD_PACKAGES += libncurses5-dev # needed by mod-gearman BUILD_PACKAGES += libevent-dev BUILD_PACKAGES += libgd-dev BUILD_PACKAGES += libglib2.0-dev -BUILD_PACKAGES += libgnutls-dev +BUILD_PACKAGES += libgnutls28-dev BUILD_PACKAGES += libldap2-dev BUILD_PACKAGES += libltdl-dev BUILD_PACKAGES += libmcrypt-dev From git at mathias-kettner.de Tue Nov 18 10:34:10 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Nov 2014 10:34:10 +0100 Subject: [omd-commits] OMD Git: omd: omd backup does not drop privileges anymore when performing the backup as root Message-ID: <20141118093410.E8C25807DF@mail.mathias-kettner.de> Module: omd Branch: master Commit: d294c8781d790f8e046b387bf598551f4f50067d URL: http://omdistro.org/projects/omd/repository/revisions/d294c8781d790f8e046b387bf598551f4f50067d Author: Lars Michelsen Date: Tue Nov 18 10:33:59 2014 +0100 Commiter: Lars Michelsen Date: Tue Nov 18 10:33:59 2014 +0100 omd backup does not drop privileges anymore when performing the backup as root --- packages/omd/omd | 63 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) Diff: http://omdistro.org/projects/omd/repository/diff/?rev=d294c8781d790f8e046b387bf598551f4f50067d From git at mathias-kettner.de Tue Nov 18 10:34:10 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Nov 2014 10:34:10 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20141118093411.0542D807DC@mail.mathias-kettner.de> Module: omd Branch: master Commit: 287cc5d065c6de73339a0b5d60dbcfbc0f70052b URL: http://omdistro.org/projects/omd/repository/revisions/287cc5d065c6de73339a0b5d60dbcfbc0f70052b Author: Lars Michelsen Date: Tue Nov 18 10:34:07 2014 +0100 Commiter: Lars Michelsen Date: Tue Nov 18 10:34:07 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Tue Nov 18 14:24:41 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Nov 2014 14:24:41 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of ssh://mathias-kettner.de/omd Message-ID: <20141118132441.8D91780807@mail.mathias-kettner.de> Module: omd Branch: master Commit: 924a943d1093ddda9c9c60f863031ba5136278b0 URL: http://omdistro.org/projects/omd/repository/revisions/924a943d1093ddda9c9c60f863031ba5136278b0 Author: Mathias Kettner Date: Tue Nov 18 14:24:40 2014 +0100 Commiter: Mathias Kettner Date: Tue Nov 18 14:24:40 2014 +0100 Merge branch 'master' of ssh://mathias-kettner.de/omd --- From git at mathias-kettner.de Tue Nov 18 14:24:41 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Nov 2014 14:24:41 +0100 Subject: [omd-commits] OMD Git: omd: Check_MK: add config plugins directory Message-ID: <20141118132441.A72A280806@mail.mathias-kettner.de> Module: omd Branch: master Commit: 17a021cb93bf2708dd050a7f64b90298ee171403 URL: http://omdistro.org/projects/omd/repository/revisions/17a021cb93bf2708dd050a7f64b90298ee171403 Author: Mathias Kettner Date: Tue Nov 18 14:24:38 2014 +0100 Commiter: Mathias Kettner Date: Tue Nov 18 14:24:38 2014 +0100 Check_MK: add config plugins directory --- 0 files changed diff --git a/packages/check_mk/skel/local/share/check_mk/web/plugins/config/.gitignore b/packages/check_mk/skel/local/share/check_mk/web/plugins/config/.gitignore new file mode 100644 index 0000000..e69de29 From git at mathias-kettner.de Tue Nov 18 14:41:50 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Nov 2014 14:41:50 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: updated to current nightly Message-ID: <20141118134150.BB8DF8022C@mail.mathias-kettner.de> Module: omd Branch: master Commit: 5183d5ebf5317ad356a5dd344f5e516d74c9c1d7 URL: http://omdistro.org/projects/omd/repository/revisions/5183d5ebf5317ad356a5dd344f5e516d74c9c1d7 Author: Lars Michelsen Date: Tue Nov 18 14:41:42 2014 +0100 Commiter: Lars Michelsen Date: Tue Nov 18 14:41:42 2014 +0100 nagvis: updated to current nightly --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1487116 -> 1487162 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index 03cc5f4..5820aa2 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Tue Nov 18 14:41:50 2014 From: git at mathias-kettner.de (git version control) Date: Tue, 18 Nov 2014 14:41:50 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20141118134150.D1C2E80200@mail.mathias-kettner.de> Module: omd Branch: master Commit: b6eb8d40aab57ce6611c634eb9c9c9c0c9b9cc2c URL: http://omdistro.org/projects/omd/repository/revisions/b6eb8d40aab57ce6611c634eb9c9c9c0c9b9cc2c Author: Lars Michelsen Date: Tue Nov 18 14:41:45 2014 +0100 Commiter: Lars Michelsen Date: Tue Nov 18 14:41:45 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Wed Nov 19 10:58:39 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 19 Nov 2014 10:58:39 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current nightly Message-ID: <20141119095840.02ACE807BE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 28eab635015a02d185c2b9de2b3c0e28536b34bc URL: http://omdistro.org/projects/omd/repository/revisions/28eab635015a02d185c2b9de2b3c0e28536b34bc Author: Lars Michelsen Date: Wed Nov 19 10:58:34 2014 +0100 Commiter: Lars Michelsen Date: Wed Nov 19 10:58:34 2014 +0100 nagvis: Updated to current nightly --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1487162 -> 1486554 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index 5820aa2..9db7966 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Wed Nov 19 11:04:21 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 19 Nov 2014 11:04:21 +0100 Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current nightly Message-ID: <20141119100421.34673807E5@mail.mathias-kettner.de> Module: omd Branch: master Commit: cfd97920020c82dbfa6bfcc08bf4913ca5680a7f URL: http://omdistro.org/projects/omd/repository/revisions/cfd97920020c82dbfa6bfcc08bf4913ca5680a7f Author: Lars Michelsen Date: Wed Nov 19 11:04:17 2014 +0100 Commiter: Lars Michelsen Date: Wed Nov 19 11:04:17 2014 +0100 nagvis: Updated to current nightly --- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1486554 -> 1486546 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz index 9db7966..1282a4d 100644 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ From git at mathias-kettner.de Thu Nov 20 09:00:51 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Nov 2014 09:00:51 +0100 Subject: [omd-commits] OMD Git: omd: Added build support for Ubuntu 14.10 Message-ID: <20141120080051.7C971807DF@mail.mathias-kettner.de> Module: omd Branch: master Commit: b0be6f4c1ed438363da30e4e62d1fad6578cef9a URL: http://omdistro.org/projects/omd/repository/revisions/b0be6f4c1ed438363da30e4e62d1fad6578cef9a Author: Lars Michelsen Date: Thu Nov 20 09:00:47 2014 +0100 Commiter: Lars Michelsen Date: Thu Nov 20 09:00:47 2014 +0100 Added build support for Ubuntu 14.10 --- Changelog | 1 + distros/Makefile.UBUNTU_14.10 | 99 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/Changelog b/Changelog index 2402264..0e67e3c 100644 --- a/Changelog +++ b/Changelog @@ -34,6 +34,7 @@ This file documents the revision history for the Open Monitoring Distribution about these files manually. - Added build support for SLES 12 - Added build support for CentOS 6.6 + - Added build support for Ubuntu 14.10 1.20 Aug 25 2014 - apache: Changed order of apache daemon startup/stopping diff --git a/distros/Makefile.UBUNTU_14.10 b/distros/Makefile.UBUNTU_14.10 new file mode 100644 index 0000000..2850c58 --- /dev/null +++ b/distros/Makefile.UBUNTU_14.10 @@ -0,0 +1,99 @@ +DISTRO_CODE = utopic +BUILD_PACKAGES = +BUILD_PACKAGES += smbclient +BUILD_PACKAGES += build-essential +BUILD_PACKAGES += dpatch +BUILD_PACKAGES += dnsutils +BUILD_PACKAGES += fping +BUILD_PACKAGES += smbclient # otherwise missing path in util.pm +BUILD_PACKAGES += git-buildpackage +BUILD_PACKAGES += libboost-all-dev +BUILD_PACKAGES += libcloog-ppl1 +BUILD_PACKAGES += libcairo2-dev +BUILD_PACKAGES += libcurl4-openssl-dev # needed by perl modules / thruk +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 += libreadline-dev +BUILD_PACKAGES += libssl-dev +BUILD_PACKAGES += libxml2-dev +BUILD_PACKAGES += patch +BUILD_PACKAGES += python-dev +BUILD_PACKAGES += python-setuptools +BUILD_PACKAGES += uuid-dev +BUILD_PACKAGES += snmp +BUILD_PACKAGES += apache2-threaded-dev # compiling mod_python +BUILD_PACKAGES += apache2 # compiling mod_python +BUILD_PACKAGES += libncurses5-dev # compiling mod-gearman +BUILD_PACKAGES += dietlibc-dev # is not really needed, but useful for cmk components +BUILD_PACKAGES += libpcap-dev # needed for CMC +BUILD_PACKAGES += gettext # needed for german l10n +BUILD_PACKAGES += libradiusclient-ng-dev +OS_PACKAGES = +OS_PACKAGES += time # needed for mk-job +OS_PACKAGES += traceroute # needed for Check_MK parent scan +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 += libdbi1 +OS_PACKAGES += libevent-1.4-2 +OS_PACKAGES += libltdl7 +OS_PACKAGES += libnet-snmp-perl +OS_PACKAGES += libpango1.0-0 +OS_PACKAGES += libperl5.18 +OS_PACKAGES += libreadline5 +OS_PACKAGES += libsnmp-perl +OS_PACKAGES += libuuid1 +OS_PACKAGES += libxml2 +OS_PACKAGES += mysql-server +OS_PACKAGES += patch +OS_PACKAGES += php5-cli +OS_PACKAGES += php5-cgi +OS_PACKAGES += php5-gd +OS_PACKAGES += php5-mcrypt +OS_PACKAGES += php5-sqlite +OS_PACKAGES += php-pear +OS_PACKAGES += pyro +OS_PACKAGES += rsync +OS_PACKAGES += smbclient +OS_PACKAGES += snmp +OS_PACKAGES += unzip +OS_PACKAGES += xinetd +OS_PACKAGES += xvfb # used for thruks pdf generator +OS_PACKAGES += python-ldap # needed for ldap support in multisite +OS_PACKAGES += libradiusclient-ng2 +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_NAME = 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 = sudo su -c +ARCH = $(shell dpkg --print-architecture) +MOUNT_OPTIONS = +INIT_CMD = /etc/init.d/%(name)s %(action)s From git at mathias-kettner.de Thu Nov 20 09:43:21 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Nov 2014 09:43:21 +0100 Subject: [omd-commits] OMD Git: omd: omd cp/mv: abort if there are still processes running of the previous user Message-ID: <20141120084321.3A4FA80364@mail.mathias-kettner.de> Module: omd Branch: master Commit: 2a9c21a6e0ba92f6c087ed51994cff936d953ad4 URL: http://omdistro.org/projects/omd/repository/revisions/2a9c21a6e0ba92f6c087ed51994cff936d953ad4 Author: Mathias Kettner Date: Thu Nov 20 09:43:18 2014 +0100 Commiter: Mathias Kettner Date: Thu Nov 20 09:43:18 2014 +0100 omd cp/mv: abort if there are still processes running of the previous user --- packages/omd/.f12 | 2 +- packages/omd/omd | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/omd/.f12 b/packages/omd/.f12 index ce58226..2d00697 100644 --- a/packages/omd/.f12 +++ b/packages/omd/.f12 @@ -10,7 +10,7 @@ for hook in *.hook; do sudo cp -v $hook /omd/versions/default/lib/omd/hooks/${hook%*.hook} sudo chmod +x /omd/versions/default/lib/omd/hooks/${hook%*.hook} done -sudo mkdir /omd/versions/default/lib/omd/scripts/post-create +sudo mkdir -p /omd/versions/default/lib/omd/scripts/post-create OLD_VERSION=$(sed -rn < /omd/versions/default/bin/omd 's/^OMD_VERSION = "(.*)"$/\1/p') echo $OLD_VERSION diff --git a/packages/omd/omd b/packages/omd/omd index 3fa1512..b7b9825 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -437,6 +437,13 @@ def site_is_empty(sitename): return False return True +def find_processes_of_user(username): + try: + return os.popen("pgrep -u '%s'" % username).read().split() + except: + return [] + + def groupdel(groupname): os.system("groupdel " + groupname) @@ -2471,6 +2478,11 @@ def main_mv_or_cp(what, args, options={}): if not site_is_stopped(old): bail_out("Cannot %s site '%s' while it is running." % (action, old)) + pids = find_processes_of_user(old) + if pids: + bail_out("Cannot %s site '%s' while there are processes owned by %s.\n" + "PIDs: %s" % (action, old, old, " ".join(pids))) + if what == "mv": unmount_tmpfs(old, kill = "kill" in options) if not reuse: From git at mathias-kettner.de Thu Nov 20 10:13:15 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Nov 2014 10:13:15 +0100 Subject: [omd-commits] OMD Git: omd: omd cp -N: add a few paths for Check_MK Message-ID: <20141120091315.3FB0080351@mail.mathias-kettner.de> Module: omd Branch: master Commit: fb8d3c3b76f4652d7128b370f1542fea83976024 URL: http://omdistro.org/projects/omd/repository/revisions/fb8d3c3b76f4652d7128b370f1542fea83976024 Author: Mathias Kettner Date: Thu Nov 20 09:57:40 2014 +0100 Commiter: Mathias Kettner Date: Thu Nov 20 09:57:40 2014 +0100 omd cp -N: add a few paths for Check_MK --- packages/omd/omd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/omd/omd b/packages/omd/omd index b7b9825..607008f 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -2519,6 +2519,9 @@ def main_mv_or_cp(what, args, options={}): excludes.append("var/nagios/archive/") excludes.append("var/pnp4nagios/log/") excludes.append("var/pnp4nagios/perfdata.dump") + excludes.append("var/mkeventd/history/") + excludes.append("var/check_mk/core/history") + excludes.append("var/check_mk/core/archive/") for p in excludes: addopts += " --exclude '/%s'" % p From git at mathias-kettner.de Thu Nov 20 10:13:15 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Nov 2014 10:13:15 +0100 Subject: [omd-commits] OMD Git: omd: omd: removed many trailing spaces Message-ID: <20141120091315.519548022C@mail.mathias-kettner.de> Module: omd Branch: master Commit: c3ea8ccc8ec07ee5673ce30352d3a0eae09c64fa URL: http://omdistro.org/projects/omd/repository/revisions/c3ea8ccc8ec07ee5673ce30352d3a0eae09c64fa Author: Mathias Kettner Date: Thu Nov 20 09:57:54 2014 +0100 Commiter: Mathias Kettner Date: Thu Nov 20 09:57:54 2014 +0100 omd: removed many trailing spaces --- packages/omd/omd | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/omd/omd b/packages/omd/omd index 607008f..de70a23 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -288,8 +288,8 @@ def ask_user_choices(title, message, choices): empty_line = " %s%-78s%s\n" % (tty_bgblue + tty_white, "", tty_normal) sys.stdout.write(empty_line) for choice, title in choices: - sys.stdout.write(" %s %s%s%s%-10s %-65s%s\n" % - (tty_bgblue + tty_white, tty_bold, choice[0], + sys.stdout.write(" %s %s%s%s%-10s %-65s%s\n" % + (tty_bgblue + tty_white, tty_bold, choice[0], tty_normal + tty_bgblue + tty_white, choice[1:], title, tty_normal)) for c in choice: if c.lower() not in chars: @@ -589,7 +589,7 @@ def switch_to_site_user(): gid = p.pw_gid os.chdir(p.pw_dir) os.setgid(gid) - # Darn. The site user might have been put into further groups. + # Darn. The site user might have been put into further groups. # This is e.g. needed if you want to access the livestatus socket # from one site by another. We make use of the "id" command here. # If you know something better, that does not rely on an external @@ -998,8 +998,8 @@ def patch_template_file(src, dst, old, new): try_chown(filename, new) # If old and new skeleton file are identical, then do nothing - old_orig_path = "%s.skel.%s" % (dst, old) - new_orig_path = "%s.skel.%s" % (dst, new) + old_orig_path = "%s.skel.%s" % (dst, old) + new_orig_path = "%s.skel.%s" % (dst, new) if file(old_orig_path).read() == file(new_orig_path).read(): os.remove(old_orig_path) os.remove(new_orig_path) @@ -1007,11 +1007,11 @@ def patch_template_file(src, dst, old, new): # Now create a patch from old to new and immediately apply on # existing - possibly user modified - file. - + result = os.system("diff -u %s %s | %s/bin/patch --force --backup --forward --silent %s" % (old_orig_path, new_orig_path, site_dir(new), dst)) try_chown(dst, new) - try_chown(dst + ".rej", new) + try_chown(dst + ".rej", new) try_chown(dst + ".orig", new) if result == 0: sys.stdout.write(good + " Converted %s\n" % src) @@ -1036,7 +1036,7 @@ def patch_template_file(src, dst, old, new): elif opt_conflict == "keepold": choice = "restore" else: - choice = ask_user_choices("Conflicts in " + src + "!", + choice = ask_user_choices("Conflicts in " + src + "!", "I've tried to merge your changes with the renaming of %s into %s.\n" "Unfortunately there are conflicts with your changes. \n" "You have the following options: " % @@ -1057,7 +1057,7 @@ def patch_template_file(src, dst, old, new): if changed == 0: sys.stdout.write("Found no matching line.\n") else: - sys.stdout.write("Did brute-force replace, changed %s%d%s lines:\n" % + sys.stdout.write("Did brute-force replace, changed %s%d%s lines:\n" % (tty_bold, changed, tty_normal)) os.system("diff -u %s.orig %s" % (dst, dst)) break @@ -1920,7 +1920,7 @@ def config_set_value(hookname, value, save = True): # Call hook with 'set'. If it outputs something, that will # be our new value (i.e. hook disagrees with the new setting!) - commandline = "%s/lib/omd/hooks/%s set '%s'" % (g_sitedir, hookname, value) + commandline = "%s/lib/omd/hooks/%s set '%s'" % (g_sitedir, hookname, value) if os.getuid() == 0: commandline = 'su - %s -c "%s"' % (g_sitename, commandline) answer = os.popen(commandline).read() @@ -2305,15 +2305,15 @@ def welcome_message(): def main_init(args, options): if not site_is_disabled(g_sitename): - bail_out("Cannot initialize site that is not disabled.\n" + bail_out("Cannot initialize site that is not disabled.\n" "Please call 'omd disable %s' first." % g_sitename) if not site_is_empty(g_sitename): if not opt_force: - bail_out("The site's home directory is not empty. Please add use\n" + bail_out("The site's home directory is not empty. Please add use\n" "'omd --force init %s' if you want to erase all data." % g_sitename) - sitedir = site_dir(g_sitename) + sitedir = site_dir(g_sitename) # We must not delete the directory itself, just its contents. # The directory might be a separate filesystem. This is not quite # unlikely, since people using 'omd init' are doing this most times @@ -2430,7 +2430,7 @@ def main_disable(args, options): sys.stderr.write("This site is already disabled.\n") sys.exit(0) - stop_if_not_stopped(g_sitename) + stop_if_not_stopped(g_sitename) unmount_tmpfs(g_sitename, kill = "kill" in options) sys.stdout.write("Disabling Apache configuration for this site...") delete_apache_hook(g_sitename) @@ -2529,7 +2529,7 @@ def main_mv_or_cp(what, args, options={}): if opt_verbose: addopts += " -v" - os.system("rsync -arx %s '%s/' '%s/'" % + os.system("rsync -arx %s '%s/' '%s/'" % (addopts, site_dir(g_sitename), site_dir(new))) # give new user all files @@ -2637,7 +2637,7 @@ def diff_list(from_skelroot, g_sitedir, from_version, orig_path): else: if not rel_path: rel_path = "." - walk_skel(from_skelroot, print_diff, (from_skelroot, g_sitedir, + walk_skel(from_skelroot, print_diff, (from_skelroot, g_sitedir, from_version, old_perms), relbase = rel_path) @@ -3137,11 +3137,11 @@ commands = [ ""), ( "create", True, False, 1, 0, False, "", main_create, - [ ( "uid", "u", True, "create site user with UID ARG" ), + [ ( "uid", "u", True, "create site user with UID ARG" ), ( "gid", "g", True, "create site group with GID ARG" ), ( "reuse", None, False, "do not create a site user, reuse existing one" ), ( "no-init", "n", False, "leave new site directory empty (a later omd init does this"), - ( "no-autostart", "A", False, "set AUTOSTART to off (useful for test sites)"), + ( "no-autostart", "A", False, "set AUTOSTART to off (useful for test sites)"), ( "apache-reload", False, False, "Issue a reload of the system apache instead of a restart"), ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM)"), ], @@ -3191,7 +3191,7 @@ commands = [ "" ), ( "mv", True, False, 1, 1, False, "NEWNAME", lambda args, opts: main_mv_or_cp("mv", args, opts), - [ ( "uid", "u", True, "create site user with UID ARG" ), + [ ( "uid", "u", True, "create site user with UID ARG" ), ( "gid", "g", True, "create site group with GID ARG" ), ( "reuse", None, False, "do not create a site user, reuse existing one" ), ( "conflict", None, True, "non-interactive conflict resolution. ARG is install, keepold, abort or ask"), @@ -3201,7 +3201,7 @@ commands = [ ""), ( "cp", True, False, 1, 1, False, "NEWNAME", lambda args, opts: main_mv_or_cp("cp", args, opts), - [ ( "uid", "u", True, "create site user with UID ARG" ), + [ ( "uid", "u", True, "create site user with UID ARG" ), ( "gid", "g", True, "create site group with GID ARG" ), ( "reuse", None, False, "do not create a site user, reuse existing one" ), ( "no-rrds", None, False, "do not copy RRD files (performance data"), @@ -3240,7 +3240,7 @@ commands = [ ( "status", False, False, 2, 1, False, "[SERVICE]", lambda args, opts: main_init_action("status", args, opts), [ ( "version", "V", True, "show only sites having version ARG" ), - ( "auto", None, False, "show only sites with AUTOSTART = on"), + ( "auto", None, False, "show only sites with AUTOSTART = on"), ( "bare", "b", False, "output plain format optimized for parsing") ], "Show status of services of site(s)", ""), From git at mathias-kettner.de Thu Nov 20 10:13:15 2014 From: git at mathias-kettner.de (git version control) Date: Thu, 20 Nov 2014 10:13:15 +0100 Subject: [omd-commits] OMD Git: omd: Examples of how tmpfs-size can be specified Message-ID: <20141120091315.5A58A80300@mail.mathias-kettner.de> Module: omd Branch: master Commit: b6975e589f4464cf831be3ae811e9bf3d509db96 URL: http://omdistro.org/projects/omd/repository/revisions/b6975e589f4464cf831be3ae811e9bf3d509db96 Author: Mathias Kettner Date: Thu Nov 20 10:13:12 2014 +0100 Commiter: Mathias Kettner Date: Thu Nov 20 10:13:12 2014 +0100 Examples of how tmpfs-size can be specified --- packages/omd/omd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/omd/omd b/packages/omd/omd index de70a23..24dfaf1 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -3143,7 +3143,7 @@ commands = [ ( "no-init", "n", False, "leave new site directory empty (a later omd init does this"), ( "no-autostart", "A", False, "set AUTOSTART to off (useful for test sites)"), ( "apache-reload", False, False, "Issue a reload of the system apache instead of a restart"), - ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM)"), + ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM), examples: 500M, 20G, 60%"), ], "Create a new site (-u UID, -g GID)", @@ -3195,7 +3195,7 @@ commands = [ ( "gid", "g", True, "create site group with GID ARG" ), ( "reuse", None, False, "do not create a site user, reuse existing one" ), ( "conflict", None, True, "non-interactive conflict resolution. ARG is install, keepold, abort or ask"), - ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM)"), + ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM), examples: 500M, 20G, 60%"), ], "Rename a site", ""), @@ -3208,7 +3208,7 @@ commands = [ ( "no-logs", None, False, "do not copy log files"), ( "no-past", "N", False, "do not copy RRD file and log files"), ( "conflict", None, True, "non-interactive conflict resolution. ARG is install, keepold, abort or ask"), - ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM)"), + ( "tmpfs-size", "t", True, "specify the maximum size of the tmpfs (defaults to 50% of RAM), examples: 500M, 20G, 60%"), ], "Make a copy of a site", ""), From git at mathias-kettner.de Mon Nov 24 14:38:16 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 14:38:16 +0100 Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.4.4 Message-ID: <20141124133816.453168261D@mail.mathias-kettner.de> Module: omd Branch: master Commit: ca58605af98be0d037b05af71ed45f5f598ecc6b URL: http://omdistro.org/projects/omd/repository/revisions/ca58605af98be0d037b05af71ed45f5f598ecc6b Author: Gerhard Lausser Date: Mon Nov 24 14:32:28 2014 +0100 Commiter: Gerhard Lausser Date: Mon Nov 24 14:32:28 2014 +0100 check_oracle_health: update to 1.9.4.4 --- packages/check_oracle_health/Makefile | 2 +- packages/check_oracle_health/check_oracle_health-1.9.4.4.tar.gz | Bin 0 -> 161972 bytes packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz | Bin 162232 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile index 8a01029..6324f03 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 +VERSION = 1.9.4.4 DIR = $(NAME)-$(VERSION) .PHONY: skel diff --git a/packages/check_oracle_health/check_oracle_health-1.9.4.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.4.4.tar.gz new file mode 100644 index 0000000..9a806c4 Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.4.4.tar.gz differ diff --git a/packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz deleted file mode 100644 index 630f22f..0000000 Binary files a/packages/check_oracle_health/check_oracle_health-1.9.4.tar.gz and /dev/null differ From git at mathias-kettner.de Mon Nov 24 14:38:16 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 14:38:16 +0100 Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of mathias-kettner.de:omd Message-ID: <20141124133816.54AE8825BE@mail.mathias-kettner.de> Module: omd Branch: master Commit: 0950f64328eff9c482408e5fa7439961dbd75fd3 URL: http://omdistro.org/projects/omd/repository/revisions/0950f64328eff9c482408e5fa7439961dbd75fd3 Author: Gerhard Lausser Date: Mon Nov 24 14:32:52 2014 +0100 Commiter: Gerhard Lausser Date: Mon Nov 24 14:32:52 2014 +0100 Merge branch 'master' of mathias-kettner.de:omd --- From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: update debian 8 boost version dependency Message-ID: <20141124221336.8C5598002F@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4120572aba91daab3f4065fffeba8233e971f8eb URL: http://omdistro.org/projects/omd/repository/revisions/4120572aba91daab3f4065fffeba8233e971f8eb Author: Sven Nierlein Date: Mon Nov 24 17:08:22 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 17:08:22 2014 +0100 update debian 8 boost version dependency --- distros/Makefile.DEBIAN_8.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/distros/Makefile.DEBIAN_8.0 b/distros/Makefile.DEBIAN_8.0 index 9f08f44..e4f24a0 100644 --- a/distros/Makefile.DEBIAN_8.0 +++ b/distros/Makefile.DEBIAN_8.0 @@ -40,8 +40,8 @@ OS_PACKAGES += dnsutils OS_PACKAGES += fping OS_PACKAGES += graphviz OS_PACKAGES += libapache2-mod-fcgid -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 += libdbi-dev OS_PACKAGES += libevent-2.0-5 OS_PACKAGES += libgd3 From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: update libperl version dependency for ubuntu 14.10 Message-ID: <20141124221336.A2E1E80022@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1a64fd4a283d3a2a97f3139f9a4653fae4888bd7 URL: http://omdistro.org/projects/omd/repository/revisions/1a64fd4a283d3a2a97f3139f9a4653fae4888bd7 Author: Sven Nierlein Date: Mon Nov 24 17:09:13 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 17:09:13 2014 +0100 update libperl version dependency for ubuntu 14.10 --- distros/Makefile.UBUNTU_14.10 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/Makefile.UBUNTU_14.10 b/distros/Makefile.UBUNTU_14.10 index 2850c58..b783e62 100644 --- a/distros/Makefile.UBUNTU_14.10 +++ b/distros/Makefile.UBUNTU_14.10 @@ -56,7 +56,7 @@ OS_PACKAGES += libevent-1.4-2 OS_PACKAGES += libltdl7 OS_PACKAGES += libnet-snmp-perl OS_PACKAGES += libpango1.0-0 -OS_PACKAGES += libperl5.18 +OS_PACKAGES += libperl5.20 OS_PACKAGES += libreadline5 OS_PACKAGES += libsnmp-perl OS_PACKAGES += libuuid1 From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: update Scalar-List-Utils to fix ubuntu builds Message-ID: <20141124221336.B756880023@mail.mathias-kettner.de> Module: omd Branch: master Commit: 7ce62b15d46f47b8c9945dfc5fb8a64fc48e2bb5 URL: http://omdistro.org/projects/omd/repository/revisions/7ce62b15d46f47b8c9945dfc5fb8a64fc48e2bb5 Author: Sven Nierlein Date: Mon Nov 24 15:57:38 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 16:08:47 2014 +0100 perl-modules: update Scalar-List-Utils to fix ubuntu builds --- packages/perl-modules/Makefile | 2 +- packages/perl-modules/src/Scalar-List-Utils-1.31.tar.gz | Bin 72587 -> 0 bytes packages/perl-modules/src/Scalar-List-Utils-1.41.tar.gz | Bin 0 -> 81115 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index 66119e3..27f932d 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -107,7 +107,7 @@ MODULES = \ Pod-Spell-1.05.tar.gz \ Readonly-1.03.tar.gz \ Safe-Isa-1.000003.tar.gz \ - Scalar-List-Utils-1.31.tar.gz \ + Scalar-List-Utils-1.41.tar.gz \ Set-Infinite-0.65.tar.gz \ Set-Object-1.31.tar.gz \ Spreadsheet-ParseExcel-0.59.tar.gz \ diff --git a/packages/perl-modules/src/Scalar-List-Utils-1.31.tar.gz b/packages/perl-modules/src/Scalar-List-Utils-1.31.tar.gz deleted file mode 100644 index 54d868c..0000000 Binary files a/packages/perl-modules/src/Scalar-List-Utils-1.31.tar.gz and /dev/null differ diff --git a/packages/perl-modules/src/Scalar-List-Utils-1.41.tar.gz b/packages/perl-modules/src/Scalar-List-Utils-1.41.tar.gz new file mode 100644 index 0000000..d90b670 Binary files /dev/null and b/packages/perl-modules/src/Scalar-List-Utils-1.41.tar.gz differ From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: update Parse::CPAN::Meta Message-ID: <20141124221336.CC11E80020@mail.mathias-kettner.de> Module: omd Branch: master Commit: 4c726f760dec1e0f389ab7f6d2822663a5a74838 URL: http://omdistro.org/projects/omd/repository/revisions/4c726f760dec1e0f389ab7f6d2822663a5a74838 Author: Sven Nierlein Date: Mon Nov 24 16:01:08 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 16:08:47 2014 +0100 perl-modules: update Parse::CPAN::Meta --- packages/perl-modules/Makefile | 2 +- packages/perl-modules/src/Parse-CPAN-Meta-1.4405.tar.gz | Bin 20876 -> 0 bytes packages/perl-modules/src/Parse-CPAN-Meta-1.4414.tar.gz | Bin 0 -> 23457 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index 27f932d..164258c 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -97,7 +97,7 @@ MODULES = \ Package-Stash-XS-0.28.tar.gz \ PadWalker-1.96.tar.gz \ Params-Check-0.38.tar.gz \ - Parse-CPAN-Meta-1.4405.tar.gz \ + Parse-CPAN-Meta-1.4414.tar.gz \ PathTools-3.40.tar.gz \ Perl-OSType-1.003.tar.gz \ Perl-Tidy-20130806.tar.gz \ diff --git a/packages/perl-modules/src/Parse-CPAN-Meta-1.4405.tar.gz b/packages/perl-modules/src/Parse-CPAN-Meta-1.4405.tar.gz deleted file mode 100644 index c9ce86e..0000000 Binary files a/packages/perl-modules/src/Parse-CPAN-Meta-1.4405.tar.gz and /dev/null differ diff --git a/packages/perl-modules/src/Parse-CPAN-Meta-1.4414.tar.gz b/packages/perl-modules/src/Parse-CPAN-Meta-1.4414.tar.gz new file mode 100644 index 0000000..2dd13c4 Binary files /dev/null and b/packages/perl-modules/src/Parse-CPAN-Meta-1.4414.tar.gz differ From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: perl: update yamy::tiny module Message-ID: <20141124221336.E8AE380021@mail.mathias-kettner.de> Module: omd Branch: master Commit: 85f4af4dddcb867cf3e85e3be6116907c166d2e3 URL: http://omdistro.org/projects/omd/repository/revisions/85f4af4dddcb867cf3e85e3be6116907c166d2e3 Author: Sven Nierlein Date: Mon Nov 24 18:22:42 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 18:22:42 2014 +0100 perl: update yamy::tiny module --- packages/perl-modules/Makefile | 2 +- packages/perl-modules/src/YAML-Tiny-1.53.tar.gz | Bin 37746 -> 0 bytes packages/perl-modules/src/YAML-Tiny-1.64.tar.gz | Bin 0 -> 71644 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index 164258c..b94e049 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -150,7 +150,7 @@ MODULES = \ XSLoader-0.16.tar.gz \ YAML-0.84.tar.gz \ YAML-Syck-1.27.tar.gz \ - YAML-Tiny-1.53.tar.gz \ + YAML-Tiny-1.64.tar.gz \ base-2.18.tar.gz \ boolean-0.30.tar.gz \ common-sense-3.72.tar.gz \ diff --git a/packages/perl-modules/src/YAML-Tiny-1.53.tar.gz b/packages/perl-modules/src/YAML-Tiny-1.53.tar.gz deleted file mode 100644 index 3299412..0000000 Binary files a/packages/perl-modules/src/YAML-Tiny-1.53.tar.gz and /dev/null differ diff --git a/packages/perl-modules/src/YAML-Tiny-1.64.tar.gz b/packages/perl-modules/src/YAML-Tiny-1.64.tar.gz new file mode 100644 index 0000000..081c65a Binary files /dev/null and b/packages/perl-modules/src/YAML-Tiny-1.64.tar.gz differ From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: remove duplicate smbclient from ubuntu distrofiles Message-ID: <20141124221337.0F65F80022@mail.mathias-kettner.de> Module: omd Branch: master Commit: 8547d9639218bdde235818d1640bbb4569749e79 URL: http://omdistro.org/projects/omd/repository/revisions/8547d9639218bdde235818d1640bbb4569749e79 Author: Sven Nierlein Date: Mon Nov 24 19:18:01 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 19:18:01 2014 +0100 remove duplicate smbclient from ubuntu distrofiles --- distros/Makefile.UBUNTU_13.10 | 1 - distros/Makefile.UBUNTU_14.04 | 1 - distros/Makefile.UBUNTU_14.10 | 1 - 3 files changed, 3 deletions(-) diff --git a/distros/Makefile.UBUNTU_13.10 b/distros/Makefile.UBUNTU_13.10 index 413e956..22450a8 100644 --- a/distros/Makefile.UBUNTU_13.10 +++ b/distros/Makefile.UBUNTU_13.10 @@ -1,6 +1,5 @@ DISTRO_CODE = saucy BUILD_PACKAGES = -BUILD_PACKAGES += smbclient BUILD_PACKAGES += build-essential BUILD_PACKAGES += dpatch BUILD_PACKAGES += dnsutils diff --git a/distros/Makefile.UBUNTU_14.04 b/distros/Makefile.UBUNTU_14.04 index 2098ea3..83603a3 100644 --- a/distros/Makefile.UBUNTU_14.04 +++ b/distros/Makefile.UBUNTU_14.04 @@ -1,6 +1,5 @@ DISTRO_CODE = trusty BUILD_PACKAGES = -BUILD_PACKAGES += smbclient BUILD_PACKAGES += build-essential BUILD_PACKAGES += dpatch BUILD_PACKAGES += dnsutils diff --git a/distros/Makefile.UBUNTU_14.10 b/distros/Makefile.UBUNTU_14.10 index b783e62..9d1bfc0 100644 --- a/distros/Makefile.UBUNTU_14.10 +++ b/distros/Makefile.UBUNTU_14.10 @@ -1,6 +1,5 @@ DISTRO_CODE = utopic BUILD_PACKAGES = -BUILD_PACKAGES += smbclient BUILD_PACKAGES += build-essential BUILD_PACKAGES += dpatch BUILD_PACKAGES += dnsutils From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: update install order Message-ID: <20141124221337.2295280020@mail.mathias-kettner.de> Module: omd Branch: master Commit: 44f0cbb92e01694c89300ab8e6f9fc2f7a316f54 URL: http://omdistro.org/projects/omd/repository/revisions/44f0cbb92e01694c89300ab8e6f9fc2f7a316f54 Author: Sven Nierlein Date: Mon Nov 24 18:40:14 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 18:40:14 2014 +0100 perl-modules: update install order --- packages/perl-modules/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index b94e049..d6eb209 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -6,7 +6,6 @@ DISTRO = $(shell ../../distro) MODULES = \ ExtUtils-MakeMaker-6.72.tar.gz \ - autodie-2.25.tar.gz \ Any-Moose-0.21.tar.gz \ AppConfig-1.66.tar.gz \ Attribute-Handlers-0.93.tar.gz \ @@ -97,7 +96,6 @@ MODULES = \ Package-Stash-XS-0.28.tar.gz \ PadWalker-1.96.tar.gz \ Params-Check-0.38.tar.gz \ - Parse-CPAN-Meta-1.4414.tar.gz \ PathTools-3.40.tar.gz \ Perl-OSType-1.003.tar.gz \ Perl-Tidy-20130806.tar.gz \ @@ -150,7 +148,7 @@ MODULES = \ XSLoader-0.16.tar.gz \ YAML-0.84.tar.gz \ YAML-Syck-1.27.tar.gz \ - YAML-Tiny-1.64.tar.gz \ + autodie-2.25.tar.gz \ base-2.18.tar.gz \ boolean-0.30.tar.gz \ common-sense-3.72.tar.gz \ @@ -191,6 +189,7 @@ MODULES = \ Module-Metadata-1.000014.tar.gz \ Object-Signature-1.07.tar.gz \ PDF-Reuse-0.35.tar.gz \ + Parse-CPAN-Meta-1.4414.tar.gz \ Pod-Coverage-0.23.tar.gz \ Template-Timer-1.00.tar.gz \ Term-Clui-1.68.tar.gz \ @@ -231,6 +230,7 @@ MODULES = \ Tie-IxHash-1.23.tar.gz \ Tree-Simple-1.18.tar.gz \ Tree-Simple-VisitorFactory-0.10.tar.gz \ + YAML-Tiny-1.64.tar.gz \ aliased-0.31.tar.gz \ constant-1.27.tar.gz \ Algorithm-C3-0.08.tar.gz \ @@ -280,6 +280,7 @@ MODULES = \ DateTime-TimeZone-1.60.tar.gz \ Getopt-Long-Descriptive-0.093.tar.gz \ Log-Dispatch-2.41.tar.gz \ + Monitoring-Plugin-0.37.tar.gz \ Moose-2.1005.tar.gz \ MooseX-Aliases-0.11.tar.gz \ MooseX-AttributeHelpers-0.23.tar.gz \ @@ -288,7 +289,6 @@ MODULES = \ MooseX-Role-Parameterized-1.00.tar.gz \ MooseX-SemiAffordanceAccessor-0.09.tar.gz \ Nagios-Plugin-0.36.tar.gz \ - Monitoring-Plugin-0.37.tar.gz \ String-RewritePrefix-0.006.tar.gz \ Text-Flow-0.01.tar.gz \ namespace-clean-0.24.tar.gz \ From git at mathias-kettner.de Mon Nov 24 23:13:36 2014 From: git at mathias-kettner.de (git version control) Date: Mon, 24 Nov 2014 23:13:36 +0100 Subject: [omd-commits] OMD Git: omd: perl-modules: added cpan-meta-yaml Message-ID: <20141124221337.330B480021@mail.mathias-kettner.de> Module: omd Branch: master Commit: 91c5b93b331fb01faf6cbb3649ef588afd9678aa URL: http://omdistro.org/projects/omd/repository/revisions/91c5b93b331fb01faf6cbb3649ef588afd9678aa Author: Sven Nierlein Date: Mon Nov 24 19:00:04 2014 +0100 Commiter: Sven Nierlein Date: Mon Nov 24 19:00:04 2014 +0100 perl-modules: added cpan-meta-yaml --- packages/perl-modules/Makefile | 1 + packages/perl-modules/src/CPAN-Meta-YAML-0.012.tar.gz | Bin 0 -> 47693 bytes 2 files changed, 1 insertion(+) diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile index d6eb209..59c177c 100644 --- a/packages/perl-modules/Makefile +++ b/packages/perl-modules/Makefile @@ -163,6 +163,7 @@ MODULES = \ Archive-Zip-1.30.tar.gz \ Bit-Vector-7.3.tar.gz \ CGI.pm-3.63.tar.gz \ + CPAN-Meta-YAML-0.012.tar.gz \ Cairo-1.103.tar.gz \ Color-Scheme-1.05.tar.gz \ DBD-Oracle-1.64.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 Wed Nov 26 20:00:59 2014 From: git at mathias-kettner.de (git version control) Date: Wed, 26 Nov 2014 20:00:59 +0100 Subject: [omd-commits] OMD Git: omd: NagVis: Added 1.8rc1 Message-ID: <20141126190059.D47DE807B8@mail.mathias-kettner.de> Module: omd Branch: master Commit: 1da553ee61c5be58269153875b7d4ae42d8dc1ed URL: http://omdistro.org/projects/omd/repository/revisions/1da553ee61c5be58269153875b7d4ae42d8dc1ed Author: Lars Michelsen Date: Wed Nov 26 20:00:32 2014 +0100 Commiter: Lars Michelsen Date: Wed Nov 26 20:00:32 2014 +0100 NagVis: Added 1.8rc1 --- Changelog | 2 +- packages/nagvis/Makefile | 2 +- packages/nagvis/nagvis-1.8-nightly.tar.gz | Bin 1486546 -> 0 bytes packages/nagvis/nagvis-1.8rc1.tar.gz | Bin 0 -> 1457273 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 0e67e3c..8799adc 100644 --- a/Changelog +++ b/Changelog @@ -19,7 +19,7 @@ This file documents the revision history for the Open Monitoring Distribution you can stream a backup cross the network. This might not only be useful for backups, but also for migrations across servers. - NagVis: - - Update to current nightly build + - Update to version 1.8rc1 - 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..bf0102d 100644 --- a/packages/nagvis/Makefile +++ b/packages/nagvis/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.omd NAME = nagvis -VERSION = 1.8-nightly +VERSION = 1.8rc1 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 1282a4d..0000000 Binary files a/packages/nagvis/nagvis-1.8-nightly.tar.gz and /dev/null differ diff --git a/packages/nagvis/nagvis-1.8rc1.tar.gz b/packages/nagvis/nagvis-1.8rc1.tar.gz new file mode 100644 index 0000000..bd1102b Binary files /dev/null and b/packages/nagvis/nagvis-1.8rc1.tar.gz differ