From 8dd3aa3a0acaa786b7794744a31bb44d991c2fb1 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 5 May 2016 18:10:23 +0200
Subject: Added cleanUp() and cert_import scriptlet.

---
 .../dogtagpki/server/rest/SystemConfigService.java | 42 ++++++++++++----------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'base/server/cms')

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
@@ -266,6 +266,29 @@ public class SystemConfigService extends PKIService implements SystemConfigResou
         finalizeConfiguration(request, response);
     }
 
+    @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() {
 
@@ -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) {
-- 
cgit