diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-05-05 18:10:23 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-05-05 19:03:18 +0200 |
commit | 8dd3aa3a0acaa786b7794744a31bb44d991c2fb1 (patch) | |
tree | 0484d36bbe3908309a69cf8c2d329187a80fe83c /base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java | |
parent | 2be9c6eaeb178325e9564d6a47e8078b4d2f0e1f (diff) | |
download | pki-8dd3aa3a0acaa786b7794744a31bb44d991c2fb1.tar.gz pki-8dd3aa3a0acaa786b7794744a31bb44d991c2fb1.tar.xz pki-8dd3aa3a0acaa786b7794744a31bb44d991c2fb1.zip |
Added cleanUp() and cert_import scriptlet.ticket-2244-2
Diffstat (limited to 'base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java')
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java | 42 |
1 files changed, 23 insertions, 19 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 e4f5aec3f..7cedbf24b 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/SystemConfigService.java @@ -267,6 +267,29 @@ public class SystemConfigService extends PKIService implements SystemConfigResou } @Override + public void cleanUp() { + + cs.putInteger("cs.state", 1); + + // update serial numbers for clones + + // save some variables, remove remaining preops + try { + ConfigurationUtils.removePreopConfigEntries(); + } catch (EBaseException e) { + CMS.debug(e); + throw new PKIException("Errors when removing preop config entries: " + e, e); + } + + // Create an empty file that designates the fact that although + // this server instance has been configured, it has NOT yet + // been restarted! + String restart_server = instanceRoot + "/conf/" + RESTART_SERVER_AFTER_CONFIGURATION; + Utils.exec("touch " + restart_server); + Utils.exec("chmod 00660 " + restart_server); + } + + @Override public ConfigurationResponse getConfigurationResponse() { HttpSession session = servletRequest.getSession(); @@ -636,25 +659,6 @@ public class SystemConfigService extends PKIService implements SystemConfigResou } public void finalizeConfiguration(ConfigurationRequest request, ConfigurationResponse response) { - - cs.putInteger("cs.state", 1); - - // update serial numbers for clones - - // save some variables, remove remaining preops - try { - ConfigurationUtils.removePreopConfigEntries(); - } catch (EBaseException e) { - CMS.debug(e); - throw new PKIException("Errors when removing preop config entries: " + e, e); - } - - // Create an empty file that designates the fact that although - // this server instance has been configured, it has NOT yet - // been restarted! - String restart_server = instanceRoot + "/conf/" + RESTART_SERVER_AFTER_CONFIGURATION; - Utils.exec("touch " + restart_server); - Utils.exec("chmod 00660 " + restart_server); } public void configureAdministrator(ConfigurationRequest data, ConfigurationResponse response) { |