From 171e9a36b0285d96e9c1ac526ba7167ea5091d4e Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 25 Feb 2021 15:18:08 +0100
Subject: [PATCH] OO-5314: let dmz as old /dmz/ default
---
src/main/java/org/olat/core/dispatcher/DispatcherModule.java | 3 ---
.../org/olat/core/dispatcher/_spring/dispatcherContext.xml | 3 +++
src/main/resources/serviceconfig/olat.properties | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/core/dispatcher/DispatcherModule.java b/src/main/java/org/olat/core/dispatcher/DispatcherModule.java
index 63f19ee4e4e..27870c7cbf3 100644
--- a/src/main/java/org/olat/core/dispatcher/DispatcherModule.java
+++ b/src/main/java/org/olat/core/dispatcher/DispatcherModule.java
@@ -278,9 +278,6 @@ public class DispatcherModule {
*/
public void setDispatchers(Map<String, Dispatcher> dispatchers) {
this.dispatchers = dispatchers;
-
- Dispatcher dispatcher = dispatchers.get("/dmz/");
- dispatchers.put(pathDefault, dispatcher);
}
public static String getPathDefault() {
diff --git a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
index ff7ec846d8a..0a5a55786e3 100644
--- a/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
+++ b/src/main/java/org/olat/core/dispatcher/_spring/dispatcherContext.xml
@@ -15,6 +15,9 @@
<entry key="/dmz/">
<ref bean="dmzbean" />
</entry>
+ <entry key="/${server.login.path}/">
+ <ref bean="dmzbean" />
+ </entry>
<entry key="/robots.txt">
<ref bean="robotsdispatcher" />
</entry>
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 1ecf8a5b294..923a8a76e04 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -660,7 +660,7 @@ server.domainname=localhost
server.port=8080
# the default path to login screen (without /)
-server.login.path=log
+server.login.path=dmz
########################################################################
# MathJAX CDN
--
GitLab