]> WPIA git - gigi.git/commitdiff
upd: don’t initialize name.suffix from name.www
authorLucas Werkmeister <mail@lucaswerkmeister.de>
Wed, 22 Mar 2017 18:30:59 +0000 (19:30 +0100)
committerLucas Werkmeister <mail@lucaswerkmeister.de>
Wed, 22 Mar 2017 18:30:59 +0000 (19:30 +0100)
This feature was somewhat backward (normally, name.www defaults to
www.name.suffix), and would have broken on www subdomains not exactly
three letters wrong. Let’s remove it.

Change-Id: Iddf29a2c3fd1f5e92df7bba31d3c44131d74b84c

src/club/wpia/gigi/util/ServerConstants.java

index 8ff3883cf99f4f923a2b634743d0f1a064edff70..3fd2e70e7f57a72aefff38847c811f84ab0cf7da 100644 (file)
@@ -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));