From: Lucas Werkmeister <mail@lucaswerkmeister.de>
Date: Wed, 22 Mar 2017 21:38:50 +0000 (+0100)
Subject: Merge changes Ie9951caa,I9a57ce72
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=28b216e0a027c8d82b4db179d79974bd8d3c0aff;hp=48cdee98b637db100d4b85093db1220da42d0deb

Merge changes Ie9951caa,I9a57ce72

* changes:
  fix: Typo pointed out while reviewing change 492
  chg: Make synchronization on the Database layer explicit
---

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));