X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Fclub%2Fwpia%2Fgigi%2Futil%2FServerConstants.java;h=e2d459ba87cee5f98a07f84e047b7f9dc085b6c7;hp=3fd2e70e7f57a72aefff38847c811f84ab0cf7da;hb=ca5b2d7f196081e136a5b48795cefec951b60193;hpb=2c10994c21d31d4dc66ea32f43df82423fd6e9eb

diff --git a/src/club/wpia/gigi/util/ServerConstants.java b/src/club/wpia/gigi/util/ServerConstants.java
index 3fd2e70e..e2d459ba 100644
--- a/src/club/wpia/gigi/util/ServerConstants.java
+++ b/src/club/wpia/gigi/util/ServerConstants.java
@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import club.wpia.gigi.ocsp.OCSPResponder;
+
 public class ServerConstants {
 
     public enum Host {
@@ -35,7 +37,11 @@ public class ServerConstants {
          * Hosts the certificate repository for the certificates generated
          * during NRE. Also not served by Gigi.
          */
-        CRT_REPO("g2.crt");
+        CRT_REPO("g2.crt"),
+        /**
+         * Hosts the {@link OCSPResponder}.
+         */
+        OCSP_RESPONDER("g2.ocsp");
 
         private final String value;
 
@@ -62,6 +68,14 @@ public class ServerConstants {
 
     private static String appIdentifier = null;
 
+    private static String mailSupport;
+
+    private static String mailBoard;
+
+    private static String mailQuiz;
+
+    private static String mailQuizAdmin;
+
     public static void init(Properties conf) {
         securePort = port = "";
         if ( !conf.getProperty("https.port").equals("443")) {
@@ -87,6 +101,10 @@ public class ServerConstants {
         if (appIdentifier == null) {
             throw new Error("App identifier missing");
         }
+        mailSupport = conf.getProperty("mail.support", "support@" + suffix);
+        mailBoard = conf.getProperty("mail.board", "board@" + suffix);
+        mailQuiz = conf.getProperty("mail.quiz", "quiz@" + suffix);
+        mailQuizAdmin = conf.getProperty("mail.quizAdmin", "quiz-admin@" + suffix);
     }
 
     public static String getHostName(Host h) {
@@ -134,19 +152,19 @@ public class ServerConstants {
     }
 
     public static String getSupportMailAddress() {
-        return "support@" + getSuffix();
+        return mailSupport;
     }
 
     public static String getBoardMailAddress() {
-        return "board@" + getSuffix();
+        return mailBoard;
     }
 
     public static String getQuizMailAddress() {
-        return "quiz@" + getSuffix();
+        return mailQuiz;
     }
 
     public static String getQuizAdminMailAddress() {
-        return "quiz-admin@" + getSuffix();
+        return mailQuizAdmin;
     }
 
     public static String getAppName() {