upd: keep host names scalable and configurable

[gigi.git] / src / club / wpia / gigi / output / ClientCSRGenerate.java

diff --git a/src/club/wpia/gigi/output/ClientCSRGenerate.java b/src/club/wpia/gigi/output/ClientCSRGenerate.java
index 1eaa6421d52b89a6d00da799a4844ee46a136b3a..ddf7d7aad4f0d76789e670c6f312ebcd596a7e43 100644 (file)
--- a/src/club/wpia/gigi/output/ClientCSRGenerate.java
+++ b/src/club/wpia/gigi/output/ClientCSRGenerate.java
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import club.wpia.gigi.output.template.Template;
 import club.wpia.gigi.pages.Page;
 import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 
 public class ClientCSRGenerate {
 
@@ -17,9 +18,9 @@ public class ClientCSRGenerate {
     public static void output(HttpServletRequest req, HttpServletResponse resp) {
         HashMap<String, Object> vars = new HashMap<String, Object>();
         vars.put("minsize", "2048");
-        vars.put("normalhost", "https://" + ServerConstants.getWwwHostNamePortSecure());
-        vars.put("securehost", "https://" + ServerConstants.getSecureHostNamePortSecure());
-        vars.put("statichost", "https://" + ServerConstants.getStaticHostNamePortSecure());
+        vars.put("normalhost", "https://" + ServerConstants.getHostNamePortSecure(Host.WWW));
+        vars.put("securehost", "https://" + ServerConstants.getHostNamePortSecure(Host.SECURE));
+        vars.put("statichost", "https://" + ServerConstants.getHostNamePortSecure(Host.STATIC));
         try {
             normal.output(resp.getWriter(), Page.getLanguage(req), vars);
         } catch (IOException e) {