From: Benny Baumann <BenBE1987@gmx.net>
Date: Wed, 22 Mar 2017 21:05:36 +0000 (+0100)
Subject: Merge "upd: don’t initialize name.suffix from name.www"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=2c10994c21d31d4dc66ea32f43df82423fd6e9eb;hp=687e008f75331588c64cd3b4ca00ca224b1eaff1

Merge "upd: don’t initialize name.suffix from name.www"
---

diff --git a/src/club/wpia/gigi/util/ServerConstants.java b/src/club/wpia/gigi/util/ServerConstants.java
index 8ff3883c..3fd2e70e 100644
--- a/src/club/wpia/gigi/util/ServerConstants.java
+++ b/src/club/wpia/gigi/util/ServerConstants.java
@@ -73,7 +73,7 @@ public class ServerConstants {
         secureBindPort = conf.getProperty("https.bindPort", conf.getProperty("https.port"));
         bindPort = conf.getProperty("http.bindPort", conf.getProperty("http.port"));
 
-        suffix = conf.getProperty("name.suffix", conf.getProperty("name.www", "www.wpia.local").substring(4));
+        suffix = conf.getProperty("name.suffix", "wpia.local");
         HashMap<Host, String> hostnames = new HashMap<>();
         for (Host h : Host.values()) {
             hostnames.put(h, conf.getProperty("name." + h.getConfigName(), h.getHostDefaultPrefix() + "." + suffix));