From 13d0a277cc88bf18d255dc3820aa9273e6c3d540 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 17 Mar 2025 01:59:55 +0100 Subject: [PATCH] Fix frontend from other loc --- .../java/net/miarma/contaminus/common/ConfigManager.java | 6 ++++++ .../net/miarma/contaminus/server/WebServerVerticle.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/net/miarma/contaminus/common/ConfigManager.java b/backend/src/main/java/net/miarma/contaminus/common/ConfigManager.java index 8277c21..29bafeb 100644 --- a/backend/src/main/java/net/miarma/contaminus/common/ConfigManager.java +++ b/backend/src/main/java/net/miarma/contaminus/common/ConfigManager.java @@ -69,6 +69,12 @@ public class ConfigManager { getOS() == OSType.LINUX ? ".config/contaminus/" : ".contaminus/"); } + + public String getWebRoot() { + return config.getProperty("web.root") != null ? + config.getProperty("web.root") : + getBaseDir() + "webroot/"; + } public static OSType getOS() { String os = System.getProperty("os.name").toLowerCase(); diff --git a/backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java b/backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java index b302ac4..ac58334 100644 --- a/backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java +++ b/backend/src/main/java/net/miarma/contaminus/server/WebServerVerticle.java @@ -22,7 +22,8 @@ public class WebServerVerticle extends AbstractVerticle { router.route("/*") .handler( - StaticHandler.create("webroot") + StaticHandler.create(configManager.getWebRoot()) + .setCachingEnabled(false) .setDefaultContentEncoding("UTF-8") );