Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/legacy' into labs
Browse files Browse the repository at this point in the history
Conflicts:
	Makefile.omd
	packages/omd/omd
  • Loading branch information
sni committed Oct 8, 2015
2 parents 2490acb + bfcf6af commit c408979
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile.omd
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/omd/skel/etc/apache/conf.d/omd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit c408979

Please sign in to comment.