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