From 841db2d461b4dba7ec2ae8c7243e400ec10adbac Mon Sep 17 00:00:00 2001 From: Sven Nierlein Date: Thu, 1 Oct 2015 16:47:05 +0200 Subject: [PATCH 1/3] release 1.30 Signed-off-by: Sven Nierlein --- Changelog | 2 +- Makefile.omd | 4 ++-- packages/omd/omd | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index b79f922e2..c61d099dc 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,6 @@ This file documents the revision history for the Open Monitoring Distribution -1.30 (next, not yet released) +1.30 Oct 01 2014 - omd: - Added "Basic / ADMIN_MAIL" hook to configure the target mail address for eMails sent to the site user (e.g. created by diff --git a/Makefile.omd b/Makefile.omd index 332e691b0..4cb362554 100644 --- a/Makefile.omd +++ b/Makefile.omd @@ -1,7 +1,7 @@ # General settings included by all packages -OMD_VERSION = 1.20 -OMD_SERIAL = 33 +OMD_VERSION = 1.30 +OMD_SERIAL = 35 OMD_BASE = /omd OMD_PHYSICAL_BASE = /opt/omd OMD_ROOT = $(OMD_BASE)/versions/$(OMD_VERSION) diff --git a/packages/omd/omd b/packages/omd/omd index c138ae5c7..9c9dc4ae3 100644 --- a/packages/omd/omd +++ b/packages/omd/omd @@ -27,7 +27,7 @@ import sys, os, shutil, pwd, grp, re, time, pprint, tty, termios, traceback, tarfile from subprocess import * -OMD_VERSION = "1.20" +OMD_VERSION = "1.30" # Some global variables opt_verbose = False From 50abffee83665d31698a5fe7f6d5324b5045557d Mon Sep 17 00:00:00 2001 From: Sven Nierlein Date: Mon, 5 Oct 2015 13:18:17 +0200 Subject: [PATCH 2/3] set correct release date --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index c61d099dc..8fb37a904 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,6 @@ This file documents the revision history for the Open Monitoring Distribution -1.30 Oct 01 2014 +1.30 Oct 01 2015 - omd: - Added "Basic / ADMIN_MAIL" hook to configure the target mail address for eMails sent to the site user (e.g. created by From bfcf6af147e85ded52228e499ab7d3e68435a896 Mon Sep 17 00:00:00 2001 From: Simon Meggle Date: Wed, 7 Oct 2015 19:27:17 +0200 Subject: [PATCH 3/3] apache: fixed rewrite rule to keep server_port Signed-off-by: Sven Nierlein --- packages/omd/skel/etc/apache/conf.d/omd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/omd/skel/etc/apache/conf.d/omd.conf b/packages/omd/skel/etc/apache/conf.d/omd.conf index 0f1095728..fbe7dcbcc 100644 --- a/packages/omd/skel/etc/apache/conf.d/omd.conf +++ b/packages/omd/skel/etc/apache/conf.d/omd.conf @@ -12,7 +12,7 @@ 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] +RewriteRule ^/###SITE###/?$ %{ENV:proto}://%{SERVER_NAME}:%{SERVER_PORT}/###SITE###/omd/ [R=302] # Keep original redirect as fallback, rewrite rules do no work in shared apache mode RedirectMatch ^/###SITE###$ /###SITE###/omd/