diff --git a/Changelog b/Changelog index 942017fb8..a0038358b 100644 --- a/Changelog +++ b/Changelog @@ -13,7 +13,7 @@ next: - new core Icinga 2.2.4 added -1.30 (next, not yet released) +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 diff --git a/Makefile.omd b/Makefile.omd index 0d8500c2a..3c4e8dfbc 100644 --- a/Makefile.omd +++ b/Makefile.omd @@ -1,7 +1,7 @@ # General settings included by all packages OMD_VERSION = 2.00-labs-edition -OMD_SERIAL = 34 +OMD_SERIAL = 35 OMD_BASE = /omd OMD_PHYSICAL_BASE = /opt/omd OMD_ROOT = $(OMD_BASE)/versions/$(OMD_VERSION) 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/