diff options
| -rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java | 25 | ||||
| -rw-r--r-- | base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java | 12 |
2 files changed, 22 insertions, 15 deletions
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java index ff54ec477..ffa18412e 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java @@ -171,7 +171,14 @@ public class SystemConfigService extends PKIService implements SystemConfigResou // Database Panel CMS.debug("=== Database Panel ==="); - configureDatabase(data); + try { + configureDatabase(data); + cs.commit(false); + } catch (EBaseException e) { + CMS.debug(e); + throw new PKIException("Unable to commit config parameters to file"); + } + initializeDatabase(data); configureCACertChain(data, domainXML); @@ -723,21 +730,9 @@ public class SystemConfigService extends PKIService implements SystemConfigResou cs.putString("internaldb.ldapauth.bindDN", data.getBindDN()); cs.putString("internaldb.ldapconn.secureConn", (data.getSecureConn().equals("on") ? "true" : "false")); cs.putString("preop.database.removeData", data.getRemoveData()); + } - if (csType.equals("TPS")) { - cs.putString("tokendb.activityBaseDN", "ou=Activities," + data.getBaseDN()); - cs.putString("tokendb.baseDN", "ou=Tokens," + data.getBaseDN()); - cs.putString("tokendb.certBaseDN", "ou=Certificates," + data.getBaseDN()); - cs.putString("tokendb.userBaseDN", data.getBaseDN()); - cs.putString("tokendb.hostport", data.getDsHost() + ":" + data.getDsPort()); - } - - try { - cs.commit(false); - } catch (EBaseException e2) { - e2.printStackTrace(); - throw new PKIException("Unable to commit config parameters to file"); - } + public void initializeDatabase(ConfigurationRequest data) { if (data.getIsClone().equals("true")) { String masterhost = ""; diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java index ef746d340..dea8e1ef8 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java @@ -103,4 +103,16 @@ public class TPSInstallerService extends SystemConfigService { boolean keyGen = data.getEnableServerSideKeyGen().equalsIgnoreCase("true"); ConfigurationUtils.updateKRAConnInfo(keyGen, kraUri, subsystemNick); } + + @Override + public void configureDatabase(ConfigurationRequest request) { + + super.configureDatabase(request); + + cs.putString("tokendb.activityBaseDN", "ou=Activities," + request.getBaseDN()); + cs.putString("tokendb.baseDN", "ou=Tokens," + request.getBaseDN()); + cs.putString("tokendb.certBaseDN", "ou=Certificates," + request.getBaseDN()); + cs.putString("tokendb.userBaseDN", request.getBaseDN()); + cs.putString("tokendb.hostport", request.getDsHost() + ":" + request.getDsPort()); + } } |