From git at mathias-kettner.de  Mon Dec  1 11:36:29 2014
From: git at mathias-kettner.de (git version control)
Date: Mon, 01 Dec 2014 11:36:29 +0100
Subject: [omd-commits] OMD Git: omd: check_oracle_health: update to 1.9.4.5
Message-ID: <20141201103629.BD5F280819@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   a26866d226c85624d7e7ec12786e57c3d91c8315
URL:      http://omdistro.org/projects/omd/repository/revisions/a26866d226c85624d7e7ec12786e57c3d91c8315

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Dec  1 11:34:34 2014 +0100
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Dec  1 11:34:34 2014 +0100

check_oracle_health: update to 1.9.4.5

---

 packages/check_oracle_health/Makefile                           |    2 +-
 packages/check_oracle_health/check_oracle_health-1.9.4.4.tar.gz |  Bin 161972 -> 0 bytes
 packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz |  Bin 0 -> 161992 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/check_oracle_health/Makefile b/packages/check_oracle_health/Makefile
index 6324f03..c28204d 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.4
+VERSION = 1.9.4.5
 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
deleted file mode 100644
index 9a806c4..0000000
Binary files a/packages/check_oracle_health/check_oracle_health-1.9.4.4.tar.gz and /dev/null differ
diff --git a/packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz b/packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz
new file mode 100644
index 0000000..d7f759b
Binary files /dev/null and b/packages/check_oracle_health/check_oracle_health-1.9.4.5.tar.gz differ


From git at mathias-kettner.de  Mon Dec  1 11:36:29 2014
From: git at mathias-kettner.de (git version control)
Date: Mon, 01 Dec 2014 11:36:29 +0100
Subject: [omd-commits] OMD Git: omd: t push
Message-ID: <20141201103629.D5E5D80816@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   3bb8b3c75cb0d0a2dc2f677eaa6ee305e5b6dbf4
URL:      http://omdistro.org/projects/omd/repository/revisions/3bb8b3c75cb0d0a2dc2f677eaa6ee305e5b6dbf4

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Dec  1 11:35:16 2014 +0100
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Mon Dec  1 11:35:16 2014 +0100

t push
Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Wed Dec  3 14:28:58 2014
From: git at mathias-kettner.de (git version control)
Date: Wed, 03 Dec 2014 14:28:58 +0100
Subject: [omd-commits] OMD Git: omd: Check_MK: Changed log dir directly to
	var/log
Message-ID: <20141203132858.65878807E4@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   1b1882bec37ad1fa7edcf96a8f94cbf84a4c7f6c
URL:      http://omdistro.org/projects/omd/repository/revisions/1b1882bec37ad1fa7edcf96a8f94cbf84a4c7f6c

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Dec  3 14:28:47 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Dec  3 14:28:47 2014 +0100

Check_MK: Changed log dir directly to var/log

---

 Changelog                                    |    1 +
 packages/check_mk/skel.permissions           |    1 -
 packages/check_mk/skel/etc/check_mk/defaults |    2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 8799adc..5ef3f7d 100644
--- a/Changelog
+++ b/Changelog
@@ -32,6 +32,7 @@ This file documents the revision history for the Open Monitoring Distribution
 	      Note: If you decide to downgrade from this or a following
 	      version to version 0.52 or older, you will again need to care
 	      about these files manually.
+          - Check_MK: moved log dir to var/log
           - Added build support for SLES 12
           - Added build support for CentOS 6.6
           - Added build support for Ubuntu 14.10
diff --git a/packages/check_mk/skel.permissions b/packages/check_mk/skel.permissions
index 4832c6d..3c7218c 100644
--- a/packages/check_mk/skel.permissions
+++ b/packages/check_mk/skel.permissions
@@ -1,4 +1,3 @@
-var/log/check_mk 0775
 var/check_mk/web 0775
 var/check_mk/logwatch 0775
 var/check_mk/wato 0775
diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index 8a2b84b..2422557 100644
--- a/packages/check_mk/skel/etc/check_mk/defaults
+++ b/packages/check_mk/skel/etc/check_mk/defaults
@@ -14,7 +14,7 @@ modules_dir                 = '###ROOT###/share/check_mk/modules'
 locale_dir                  = '###ROOT###/share/check_mk/locale'
 agents_dir                  = '###ROOT###/share/check_mk/agents'
 var_dir                     = '###ROOT###/var/check_mk'
-log_dir                     = '###ROOT###/var/log/check_mk'
+log_dir                     = '###ROOT###/var/log'
 lib_dir                     = '###ROOT###/lib/check_mk'
 autochecksdir               = '###ROOT###/var/check_mk/autochecks'
 precompiled_hostchecks_dir  = '###ROOT###/var/check_mk/precompiled'


From git at mathias-kettner.de  Wed Dec  3 14:28:58 2014
From: git at mathias-kettner.de (git version control)
Date: Wed, 03 Dec 2014 14:28:58 +0100
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
	mathias-kettner.de:omd
Message-ID: <20141203132858.78DF8807E2@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   281ac84007c1b2a9edae7876ba755fe0c44b0457
URL:      http://omdistro.org/projects/omd/repository/revisions/281ac84007c1b2a9edae7876ba755fe0c44b0457

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Dec  3 14:28:54 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Dec  3 14:28:54 2014 +0100

Merge branch 'master' of mathias-kettner.de:omd

---




From git at mathias-kettner.de  Wed Dec  3 14:36:57 2014
From: git at mathias-kettner.de (git version control)
Date: Wed, 03 Dec 2014 14:36:57 +0100
Subject: [omd-commits] OMD Git: omd: check_mk: removed unused file
Message-ID: <20141203133657.1F08D807F2@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   ddc1ef48128a6d748e48dc4579508f93763984b6
URL:      http://omdistro.org/projects/omd/repository/revisions/ddc1ef48128a6d748e48dc4579508f93763984b6

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Dec  3 14:36:52 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Wed Dec  3 14:36:52 2014 +0100

check_mk: removed unused file

---

 packages/check_mk/logrotate.conf |   12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/check_mk/logrotate.conf b/packages/check_mk/logrotate.conf
deleted file mode 100644
index 30eee5a..0000000
--- a/packages/check_mk/logrotate.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-###ROOT###/var/log/mkeventd.log {
-	missingok
-	rotate 52
-	compress
-	delaycompress
-	notifempty
-	sharedscripts
-        olddir mkeventd
-	postrotate
-		echo "COMMAND REOPENLOG" | unixcat ###ROOT###/tmp/run/mkeventd/status
-	endscript
-}


From git at mathias-kettner.de  Sun Dec 14 14:56:00 2014
From: git at mathias-kettner.de (git version control)
Date: Sun, 14 Dec 2014 14:56:00 +0100
Subject: [omd-commits] OMD Git: omd: update mod-gearman to 1.4.16
Message-ID: <20141214135600.58A9B8031F@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   393d520060d52237f97dbcaf0f3f46396981c98f
URL:      http://omdistro.org/projects/omd/repository/revisions/393d520060d52237f97dbcaf0f3f46396981c98f

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Sun Dec 14 14:55:33 2014 +0100
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Sun Dec 14 14:55:33 2014 +0100

update mod-gearman to 1.4.16

---

 Changelog                                      |    1 +
 packages/mod-gearman/Makefile                  |    2 +-
 packages/mod-gearman/mod_gearman-1.4.14.tar.gz |  Bin 316448 -> 0 bytes
 packages/mod-gearman/mod_gearman-1.4.16.tar.gz |  Bin 0 -> 317666 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 5ef3f7d..8a90e58 100644
--- a/Changelog
+++ b/Changelog
@@ -36,6 +36,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Added build support for SLES 12
           - Added build support for CentOS 6.6
           - Added build support for Ubuntu 14.10
+          - Mod-Gearman: Update 1.4.16
 
 1.20     Aug 25 2014
           - apache: Changed order of apache daemon startup/stopping
diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index aee5fd6..3109dcb 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = mod_gearman
-VERSION  = 1.4.14
+VERSION  = 1.4.16
 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }')
 DIR      = mod_gearman-$(VERSION)
 
diff --git a/packages/mod-gearman/mod_gearman-1.4.14.tar.gz b/packages/mod-gearman/mod_gearman-1.4.14.tar.gz
deleted file mode 100644
index 343721a..0000000
Binary files a/packages/mod-gearman/mod_gearman-1.4.14.tar.gz and /dev/null differ
diff --git a/packages/mod-gearman/mod_gearman-1.4.16.tar.gz b/packages/mod-gearman/mod_gearman-1.4.16.tar.gz
new file mode 100644
index 0000000..4e90fb3
Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.4.16.tar.gz differ


From git at mathias-kettner.de  Mon Dec 15 14:30:53 2014
From: git at mathias-kettner.de (git version control)
Date: Mon, 15 Dec 2014 14:30:53 +0100
Subject: [omd-commits] OMD Git: omd: update mod-gearman 1.4.18
Message-ID: <20141215133053.9E7008083C@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   ea1d803e7c145da1ef460191bb4c18298a2758a3
URL:      http://omdistro.org/projects/omd/repository/revisions/ea1d803e7c145da1ef460191bb4c18298a2758a3

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Dec 15 12:31:43 2014 +0100
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Mon Dec 15 12:31:43 2014 +0100

update mod-gearman 1.4.18

---

 Changelog                                      |    2 +-
 packages/mod-gearman/Makefile                  |    2 +-
 packages/mod-gearman/mod_gearman-1.4.18.tar.gz |  Bin 0 -> 317708 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 8a90e58..8611b40 100644
--- a/Changelog
+++ b/Changelog
@@ -36,7 +36,7 @@ This file documents the revision history for the Open Monitoring Distribution
           - Added build support for SLES 12
           - Added build support for CentOS 6.6
           - Added build support for Ubuntu 14.10
-          - Mod-Gearman: Update 1.4.16
+          - Mod-Gearman: Update 1.4.18
 
 1.20     Aug 25 2014
           - apache: Changed order of apache daemon startup/stopping
diff --git a/packages/mod-gearman/Makefile b/packages/mod-gearman/Makefile
index 3109dcb..1c2a3af 100644
--- a/packages/mod-gearman/Makefile
+++ b/packages/mod-gearman/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME     = mod_gearman
-VERSION  = 1.4.16
+VERSION  = 1.4.18
 GEARMAND = $(shell grep "^VERSION " ../gearmand/Makefile | awk '{ print $$3 }')
 DIR      = mod_gearman-$(VERSION)
 
diff --git a/packages/mod-gearman/mod_gearman-1.4.18.tar.gz b/packages/mod-gearman/mod_gearman-1.4.18.tar.gz
new file mode 100644
index 0000000..0a26952
Binary files /dev/null and b/packages/mod-gearman/mod_gearman-1.4.18.tar.gz differ


From git at mathias-kettner.de  Mon Dec 15 17:00:31 2014
From: git at mathias-kettner.de (git version control)
Date: Mon, 15 Dec 2014 17:00:31 +0100
Subject: [omd-commits] OMD Git: omd: made APACHE_TCP_PORT.hook print error
 messages when it cant access /omd/ sites/*
Message-ID: <20141215160031.6679D8083A@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   849900da4ee86e5ade77bf9febdef60d12c9d373
URL:      http://omdistro.org/projects/omd/repository/revisions/849900da4ee86e5ade77bf9febdef60d12c9d373

Author:   Goetz Golla <gg at mathias-kettner.de>
Date:     Mon Dec 15 16:59:44 2014 +0100
Commiter: Goetz Golla <gg at mathias-kettner.de>
Date:     Mon Dec 15 16:59:44 2014 +0100

made APACHE_TCP_PORT.hook  print error messages when it cant access /omd/sites/*

---

 packages/apache-omd/APACHE_TCP_PORT.hook |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/apache-omd/APACHE_TCP_PORT.hook b/packages/apache-omd/APACHE_TCP_PORT.hook
index 5c072fc..d02e965 100755
--- a/packages/apache-omd/APACHE_TCP_PORT.hook
+++ b/packages/apache-omd/APACHE_TCP_PORT.hook
@@ -21,7 +21,7 @@ fi
 port_is_used ()
 {
     local PORT=$1
-    ls /omd/sites/*/etc/omd/site.conf >/dev/null 2>&1 || return 1
+    ls /omd/sites/* >/dev/null || return 1
     for conf in /omd/sites/*/etc/omd/site.conf
     do
         [ $conf != /omd/sites/$OMD_SITE/etc/omd/site.conf ] || continue


From git at mathias-kettner.de  Mon Dec 15 17:00:31 2014
From: git at mathias-kettner.de (git version control)
Date: Mon, 15 Dec 2014 17:00:31 +0100
Subject: [omd-commits] OMD Git: omd: Merge branch 'master' of
 ssh://mathias-kettner.de/omd
Message-ID: <20141215160031.7621B80831@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   69e55398299858f04d07c38096906e40df2f07c2
URL:      http://omdistro.org/projects/omd/repository/revisions/69e55398299858f04d07c38096906e40df2f07c2

Author:   Goetz Golla <gg at mathias-kettner.de>
Date:     Mon Dec 15 17:00:29 2014 +0100
Commiter: Goetz Golla <gg at mathias-kettner.de>
Date:     Mon Dec 15 17:00:29 2014 +0100

Merge branch 'master' of ssh://mathias-kettner.de/omd

---




From git at mathias-kettner.de  Tue Dec 16 11:36:19 2014
From: git at mathias-kettner.de (git version control)
Date: Tue, 16 Dec 2014 11:36:19 +0100
Subject: [omd-commits] OMD Git: omd: apache: Fixed yesterdays change to
 apache hook handling
Message-ID: <20141216103619.8C49180849@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   343a965667937b314c5ab6f9ff8ad147b9b26437
URL:      http://omdistro.org/projects/omd/repository/revisions/343a965667937b314c5ab6f9ff8ad147b9b26437

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 11:36:15 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 11:36:15 2014 +0100

apache: Fixed yesterdays change to apache hook handling

---

 packages/apache-omd/APACHE_TCP_PORT.hook |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/apache-omd/APACHE_TCP_PORT.hook b/packages/apache-omd/APACHE_TCP_PORT.hook
index d02e965..0043e5e 100755
--- a/packages/apache-omd/APACHE_TCP_PORT.hook
+++ b/packages/apache-omd/APACHE_TCP_PORT.hook
@@ -21,10 +21,13 @@ fi
 port_is_used ()
 {
     local PORT=$1
-    ls /omd/sites/* >/dev/null || return 1
-    for conf in /omd/sites/*/etc/omd/site.conf
-    do
-        [ $conf != /omd/sites/$OMD_SITE/etc/omd/site.conf ] || continue
+    for S in $(ls /omd/sites); do
+        conf=/omd/sites/$S/etc/omd/site.conf
+        [ $S != $OMD_SITE ] || continue # skip current site
+        if ! ls $conf >/dev/null 2>&1; then
+            echo "ERROR: Failed to read config of site ${S}. APACHE_TCP_PORT will propably be allocated twice" >&2
+            continue
+        fi
         if grep -qx "CONFIG_APACHE_TCP_PORT='$PORT'" < $conf > /dev/null 2>&1 ; then
             return 0
         fi


From git at mathias-kettner.de  Tue Dec 16 14:17:19 2014
From: git at mathias-kettner.de (git version control)
Date: Tue, 16 Dec 2014 14:17:19 +0100
Subject: [omd-commits] OMD Git: omd: crontab init script: Exit with 0 when
	no crontab to remove
Message-ID: <20141216131719.91847802E6@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   c849e6caaef173bbf0c8518684663b52b5a10449
URL:      http://omdistro.org/projects/omd/repository/revisions/c849e6caaef173bbf0c8518684663b52b5a10449

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 14:17:16 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 14:17:16 2014 +0100

crontab init script: Exit with 0 when no crontab to remove

---

 packages/maintenance/skel/etc/init.d/crontab |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/maintenance/skel/etc/init.d/crontab b/packages/maintenance/skel/etc/init.d/crontab
index e210061..517e816 100644
--- a/packages/maintenance/skel/etc/init.d/crontab
+++ b/packages/maintenance/skel/etc/init.d/crontab
@@ -35,8 +35,10 @@ case "$1" in
         ;;
 
     stop)
-	echo "Removing Crontab..."
-	$CRONTAB $CRONTAB_OPTS -r
+        echo -n "Removing Crontab..."
+        $CRONTAB $CRONTAB_OPTS -r || exit 0
+        echo OK
+        exit 0
         ;;
 
     restart|reload)


From git at mathias-kettner.de  Tue Dec 16 18:23:48 2014
From: git at mathias-kettner.de (git version control)
Date: Tue, 16 Dec 2014 18:23:48 +0100
Subject: [omd-commits] OMD Git: omd: nagvis: fixed number of tests to be
	executed
Message-ID: <20141216172348.96A2F8062E@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   16964c361f280d0bbf92853dbb1b2a79c632810e
URL:      http://omdistro.org/projects/omd/repository/revisions/16964c361f280d0bbf92853dbb1b2a79c632810e

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 18:23:41 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 18:23:41 2014 +0100

nagvis: fixed number of tests to be executed

---

 t/20-package_nagvis.t |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/20-package_nagvis.t b/t/20-package_nagvis.t
index 6eabaee..e448762 100644
--- a/t/20-package_nagvis.t
+++ b/t/20-package_nagvis.t
@@ -12,7 +12,7 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
-my $num_tests = 375;
+my $num_tests = 373;
 if($ENV{NAGVIS_DEVEL}) {
     $num_tests += 3;
 }


From git at mathias-kettner.de  Tue Dec 16 18:47:49 2014
From: git at mathias-kettner.de (git version control)
Date: Tue, 16 Dec 2014 18:47:49 +0100
Subject: [omd-commits] OMD Git: omd: nagvis-tests: fixed number of tests to
	perform
Message-ID: <20141216174749.2C43C8005D@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   991c6531f3f7ff96d046ad8dcdbb1ada80d73dc4
URL:      http://omdistro.org/projects/omd/repository/revisions/991c6531f3f7ff96d046ad8dcdbb1ada80d73dc4

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 18:47:46 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 18:47:46 2014 +0100

nagvis-tests: fixed number of tests to perform

---

 t/20-package_nagvis.t |   31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/t/20-package_nagvis.t b/t/20-package_nagvis.t
index e448762..b81c5aa 100644
--- a/t/20-package_nagvis.t
+++ b/t/20-package_nagvis.t
@@ -12,11 +12,25 @@ BEGIN {
     use lib "$FindBin::Bin/lib/lib/perl5";
 }
 
-my $num_tests = 373;
+my $sitename  = "testsite";
+
+my $num_tests = 375;
 if($ENV{NAGVIS_DEVEL}) {
     $num_tests += 3;
 }
 
+my $has_thruk = 1;
+if (! -e '/omd/sites/' . $sitename .  '/etc/thruk') {
+    $num_tests -= 8;
+    $has_thruk = 0;
+}
+
+my $has_cmk = 1;
+if (! -e '/omd/sites/' . $sitename .  '/etc/check_mk') {
+    $num_tests -= 8;
+    $has_cmk = 0;
+}
+
 plan(tests => $num_tests);
 
 ##################################################
@@ -24,7 +38,7 @@ plan(tests => $num_tests);
 my $response;
 my $userId;
 my $omd_bin   = TestUtils::get_omd_bin();
-my $site      = TestUtils::create_test_site() or TestUtils::bail_out_clean("no further testing without site");
+my $site      = TestUtils::create_test_site($sitename) or TestUtils::bail_out_clean("no further testing without site");
 my $auth      = 'OMD Monitoring Site '.$site.':omdadmin:omd';
 my $orig_auth = $auth;
 
@@ -77,29 +91,20 @@ if (-e '/omd/sites/' . $site .  '/etc/nagios') {
     TestUtils::test_command({ cmd => "/bin/echo skip nagios url test"});
 }
 
-if (-e '/omd/sites/' . $site .  '/etc/thruk') {
+if ($has_thruk) {
     TestUtils::test_command({ cmd => $omd_bin." config $site set DEFAULT_GUI thruk" });
     TestUtils::test_command({ cmd  => "/bin/su - $site -c 'cat etc/nagvis/conf.d/urls.ini.php'",
                               like => [ '/hosturl="\[htmlcgi\]\/status.cgi\?host=\[host_name\]"/',
                                         '/htmlcgi="\/'.$site.'\/thruk\/cgi-bin"/' ] });
-} else {
-    # dummy tests to statisfy number of tests (did not know how to decrease number of them)
-    TestUtils::test_command({ cmd => "/bin/echo skip thruk url test"});
-    TestUtils::test_command({ cmd => "/bin/echo skup thruk url test"});
 }
 
-if (-e '/omd/sites/' . $site .  '/etc/check_mk') {
+if ($has_cmk) {
     TestUtils::test_command({ cmd => $omd_bin." config $site set DEFAULT_GUI check_mk" });
     TestUtils::test_command({ cmd  => "/bin/su - $site -c 'cat etc/nagvis/conf.d/urls.ini.php'",
                               like => [ '/hosturl="\[htmlcgi\]\/view\.py\?view_name=host&site=&host=\[host_name\]"/',
                                         '/htmlcgi="\/'.$site.'\/check_mk"/' ] });
-} else {
-    # dummy tests to statisfy number of tests (did not know how to decrease number of them)
-    TestUtils::test_command({ cmd => "/bin/echo skip check_mk url test"});
-    TestUtils::test_command({ cmd => "/bin/echo skup check_mk url test"});
 }
 
-
 ##################################################
 # Prepare the site for testing...
 


From git at mathias-kettner.de  Tue Dec 16 19:02:28 2014
From: git at mathias-kettner.de (git version control)
Date: Tue, 16 Dec 2014 19:02:28 +0100
Subject: [omd-commits] OMD Git: omd: nagvis: Updated to current nightly
Message-ID: <20141216180228.203F0807B8@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   6b4817df87606bb7dd15610f18937714e002d0a0
URL:      http://omdistro.org/projects/omd/repository/revisions/6b4817df87606bb7dd15610f18937714e002d0a0

Author:   Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 19:02:05 2014 +0100
Commiter: Lars Michelsen <lm at mathias-kettner.de>
Date:     Tue Dec 16 19:02:05 2014 +0100

nagvis: Updated to current nightly

---

 packages/nagvis/.gitignore                |    1 +
 packages/nagvis/Makefile                  |    2 +-
 packages/nagvis/nagvis-1.8-nightly.tar.gz |  Bin 0 -> 1492845 bytes
 packages/nagvis/nagvis-1.8rc1.tar.gz      |  Bin 1457273 -> 0 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nagvis/.gitignore b/packages/nagvis/.gitignore
index a7b9d72..c212701 100644
--- a/packages/nagvis/.gitignore
+++ b/packages/nagvis/.gitignore
@@ -2,4 +2,5 @@ nagvis-[0-9].[0-9]
 nagvis-[0-9].[0-9].[0-9]
 nagvis-[0-9].[0-9].[0-9][0-9]
 nagvis-[0-9].[0-9]b[0-9]
+nagvis-[0-9].[0-9]rc[0-9]
 nagvis-[0-9].[0-9]-nightly
diff --git a/packages/nagvis/Makefile b/packages/nagvis/Makefile
index bf0102d..7d0f044 100644
--- a/packages/nagvis/Makefile
+++ b/packages/nagvis/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.omd
 
 NAME = nagvis
-VERSION = 1.8rc1
+VERSION = 1.8-nightly
 DIR = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/nagvis/nagvis-1.8-nightly.tar.gz b/packages/nagvis/nagvis-1.8-nightly.tar.gz
new file mode 100644
index 0000000..581f191
Binary files /dev/null and b/packages/nagvis/nagvis-1.8-nightly.tar.gz differ
diff --git a/packages/nagvis/nagvis-1.8rc1.tar.gz b/packages/nagvis/nagvis-1.8rc1.tar.gz
deleted file mode 100644
index bd1102b..0000000
Binary files a/packages/nagvis/nagvis-1.8rc1.tar.gz and /dev/null differ


From git at mathias-kettner.de  Thu Dec 18 16:20:53 2014
From: git at mathias-kettner.de (git version control)
Date: Thu, 18 Dec 2014 16:20:53 +0100
Subject: [omd-commits] OMD Git: omd: adjust omd tests to new apache error
Message-ID: <20141218152053.3921580519@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   f38a6f2b5bea584df56a22570e01854f5bf646c1
URL:      http://omdistro.org/projects/omd/repository/revisions/f38a6f2b5bea584df56a22570e01854f5bf646c1

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Dec 18 15:05:09 2014 +0100
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Dec 18 15:05:09 2014 +0100

adjust omd tests to new apache error

when running omd rm --reuse <site> the next create will show
an error because it cannot access (the nonexisting) site.conf.

Signed-off-by: Sven Nierlein <Sven.Nierlein at consol.de>

---

 t/10-omd_testsite.t |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/10-omd_testsite.t b/t/10-omd_testsite.t
index 6817dfc..2343fa3 100644
--- a/t/10-omd_testsite.t
+++ b/t/10-omd_testsite.t
@@ -73,11 +73,11 @@ my $tests = [
   { cmd => $omd_bin." rm --reuse $site", stdin => "yes\n" },
   { cmd => "/usr/bin/id -u $site",       like => '/\d+/' },
   { cmd => "/usr/bin/id -g $site",       like => '/\d+/' },
-  { cmd => $omd_bin." create $site2",    like => '/Created new site '.$site2.'./' },
-  { cmd => $omd_bin." mv --reuse $site2 $site", like => '/Moving site '.$site2.' to '.$site.'.../' },
+  { cmd => $omd_bin." create $site2",    like => '/Created new site '.$site2.'./', errlike => '/ERROR: Failed to read config of site testsite./' },
+  { cmd => $omd_bin." mv --reuse $site2 $site", like => '/Moving site '.$site2.' to '.$site.'.../' , errlike => '/ERROR: Failed to read config of site testsite./' },
   { cmd => "/usr/bin/id -u $site2",      like => '/\d+/' },
   { cmd => "/usr/bin/id -g $site2",      like => '/\d+/' },
-  { cmd => $omd_bin." cp --reuse $site $site2",  like => '/Copying site '.$site.' to '.$site2.'.../', 
+  { cmd => $omd_bin." cp --reuse $site $site2",  like => '/Copying site '.$site.' to '.$site2.'.../',
                                          errlike => '/Apache port \d+ is in use\. I\'ve choosen \d+ instead\./' },
   { cmd => $omd_bin." cp --reuse $site $site2", errlike => '/must be empty/', exit => 1 },
   { cmd => $omd_bin." rm $site",         like => '/Restarting Apache...\s*OK/', stdin => "yes\n" },


From git at mathias-kettner.de  Thu Dec 18 17:40:20 2014
From: git at mathias-kettner.de (git version control)
Date: Thu, 18 Dec 2014 17:40:20 +0100
Subject: [omd-commits] OMD Git: omd: Update to Jmx4Perl 1.11 and Jolokia
	1.2.3
Message-ID: <20141218164020.C7844806A0@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   0f87e53a03c9f81c763be1eb5566fbb8105c52a2
URL:      http://omdistro.org/projects/omd/repository/revisions/0f87e53a03c9f81c763be1eb5566fbb8105c52a2

Author:   Roland Huss <roland at jolokia.org>
Date:     Thu Dec 18 17:40:19 2014 +0100
Commiter: Roland Huss <roland at jolokia.org>
Date:     Thu Dec 18 17:40:19 2014 +0100

Update to Jmx4Perl 1.11 and Jolokia 1.2.3

---

 packages/jmx4perl/Makefile                                         |    4 ++--
 packages/jmx4perl/jmx4perl-1.10.tar.gz                             |  Bin 354493 -> 0 bytes
 packages/jmx4perl/jmx4perl-1.11.tar.gz                             |  Bin 0 -> 357229 bytes
 packages/jmx4perl/jolokia-agents/1.2.2/jolokia-jvm.jar             |  Bin 389459 -> 0 bytes
 packages/jmx4perl/jolokia-agents/1.2.2/jolokia.war                 |  Bin 306314 -> 0 bytes
 packages/jmx4perl/jolokia-agents/1.2.3/jolokia-jvm.jar             |  Bin 0 -> 395172 bytes
 packages/jmx4perl/jolokia-agents/{1.2.2 => 1.2.3}/jolokia-mule.jar |  Bin 334133 -> 343125 bytes
 .../jolokia-agents/{1.2.2 => 1.2.3}/jolokia-osgi-bundle.jar        |  Bin 1337121 -> 1338453 bytes
 packages/jmx4perl/jolokia-agents/{1.2.2 => 1.2.3}/jolokia-osgi.jar |  Bin 367379 -> 390075 bytes
 packages/jmx4perl/jolokia-agents/1.2.3/jolokia.war                 |  Bin 0 -> 307617 bytes
 10 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/jmx4perl/Makefile b/packages/jmx4perl/Makefile
index d70bea8..37db0ae 100644
--- a/packages/jmx4perl/Makefile
+++ b/packages/jmx4perl/Makefile
@@ -1,8 +1,8 @@
 include ../../Makefile.omd
 
 NAME     = jmx4perl
-VERSION  = 1.10
-JOLOKIA_VERSION = 1.2.2
+VERSION  = 1.11
+JOLOKIA_VERSION = 1.2.3
 DIR      = $(NAME)-$(VERSION)
 
 .PHONY: skel
diff --git a/packages/jmx4perl/jmx4perl-1.10.tar.gz b/packages/jmx4perl/jmx4perl-1.10.tar.gz
deleted file mode 100644
index 7993fbf..0000000
Binary files a/packages/jmx4perl/jmx4perl-1.10.tar.gz and /dev/null differ
diff --git a/packages/jmx4perl/jmx4perl-1.11.tar.gz b/packages/jmx4perl/jmx4perl-1.11.tar.gz
new file mode 100644
index 0000000..a18f93b
Binary files /dev/null and b/packages/jmx4perl/jmx4perl-1.11.tar.gz differ
diff --git a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-jvm.jar b/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-jvm.jar
deleted file mode 100644
index 40a4764..0000000
Binary files a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-jvm.jar and /dev/null differ
diff --git a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia.war b/packages/jmx4perl/jolokia-agents/1.2.2/jolokia.war
deleted file mode 100644
index ebb1f2d..0000000
Binary files a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia.war and /dev/null differ
diff --git a/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-jvm.jar b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-jvm.jar
new file mode 100644
index 0000000..27d0ba8
Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-jvm.jar differ
diff --git a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-mule.jar b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-mule.jar
similarity index 51%
rename from packages/jmx4perl/jolokia-agents/1.2.2/jolokia-mule.jar
rename to packages/jmx4perl/jolokia-agents/1.2.3/jolokia-mule.jar
index 80aeadb..831389a 100644
Binary files a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-mule.jar and b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-mule.jar differ
diff --git a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-osgi-bundle.jar b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-osgi-bundle.jar
similarity index 88%
rename from packages/jmx4perl/jolokia-agents/1.2.2/jolokia-osgi-bundle.jar
rename to packages/jmx4perl/jolokia-agents/1.2.3/jolokia-osgi-bundle.jar
index 654242f..131943c 100644
Binary files a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-osgi-bundle.jar and b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-osgi-bundle.jar differ
diff --git a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-osgi.jar b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-osgi.jar
similarity index 66%
rename from packages/jmx4perl/jolokia-agents/1.2.2/jolokia-osgi.jar
rename to packages/jmx4perl/jolokia-agents/1.2.3/jolokia-osgi.jar
index 8ec9b7f..9979521 100644
Binary files a/packages/jmx4perl/jolokia-agents/1.2.2/jolokia-osgi.jar and b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia-osgi.jar differ
diff --git a/packages/jmx4perl/jolokia-agents/1.2.3/jolokia.war b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia.war
new file mode 100644
index 0000000..58ddded
Binary files /dev/null and b/packages/jmx4perl/jolokia-agents/1.2.3/jolokia.war differ


From git at mathias-kettner.de  Fri Dec 19 11:55:32 2014
From: git at mathias-kettner.de (git version control)
Date: Fri, 19 Dec 2014 11:55:32 +0100
Subject: [omd-commits] OMD Git: omd: Check_MK: Added missing
 special_agent_dir to defaults
Message-ID: <20141219105532.C9D508064B@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   b21f4b1a707f5597a5b6032e88e8d883d82d9e02
URL:      http://omdistro.org/projects/omd/repository/revisions/b21f4b1a707f5597a5b6032e88e8d883d82d9e02

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Fri Dec 19 11:55:29 2014 +0100
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Fri Dec 19 11:55:29 2014 +0100

Check_MK: Added missing special_agent_dir to defaults

---

 packages/check_mk/skel/etc/check_mk/defaults |    1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index 2422557..5f58bfc 100644
--- a/packages/check_mk/skel/etc/check_mk/defaults
+++ b/packages/check_mk/skel/etc/check_mk/defaults
@@ -13,6 +13,7 @@ check_manpages_dir          = '###ROOT###/share/check_mk/checkman'
 modules_dir                 = '###ROOT###/share/check_mk/modules'
 locale_dir                  = '###ROOT###/share/check_mk/locale'
 agents_dir                  = '###ROOT###/share/check_mk/agents'
+special_agent_dir           = '###ROOT###/share/check_mk/agents/special'
 var_dir                     = '###ROOT###/var/check_mk'
 log_dir                     = '###ROOT###/var/log'
 lib_dir                     = '###ROOT###/lib/check_mk'


From git at mathias-kettner.de  Fri Dec 19 12:15:58 2014
From: git at mathias-kettner.de (git version control)
Date: Fri, 19 Dec 2014 12:15:58 +0100
Subject: [omd-commits] OMD Git: omd: Revert "Check_MK: Added missing
 special_agent_dir to defaults"
Message-ID: <20141219111558.DCE44807FE@mail.mathias-kettner.de>

Module:   omd
Branch:   master
Commit:   6e3708b4f823bc9f9a7331402731fff4accad2ec
URL:      http://omdistro.org/projects/omd/repository/revisions/6e3708b4f823bc9f9a7331402731fff4accad2ec

Author:   Bastian Kuhn <bk at mathias-kettner.de>
Date:     Fri Dec 19 12:15:51 2014 +0100
Commiter: Bastian Kuhn <bk at mathias-kettner.de>
Date:     Fri Dec 19 12:15:51 2014 +0100

Revert "Check_MK: Added missing special_agent_dir to defaults"

This reverts commit b21f4b1a707f5597a5b6032e88e8d883d82d9e02.

---

 packages/check_mk/skel/etc/check_mk/defaults |    1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/check_mk/skel/etc/check_mk/defaults b/packages/check_mk/skel/etc/check_mk/defaults
index 5f58bfc..2422557 100644
--- a/packages/check_mk/skel/etc/check_mk/defaults
+++ b/packages/check_mk/skel/etc/check_mk/defaults
@@ -13,7 +13,6 @@ check_manpages_dir          = '###ROOT###/share/check_mk/checkman'
 modules_dir                 = '###ROOT###/share/check_mk/modules'
 locale_dir                  = '###ROOT###/share/check_mk/locale'
 agents_dir                  = '###ROOT###/share/check_mk/agents'
-special_agent_dir           = '###ROOT###/share/check_mk/agents/special'
 var_dir                     = '###ROOT###/var/check_mk'
 log_dir                     = '###ROOT###/var/log'
 lib_dir                     = '###ROOT###/lib/check_mk'