Remove legacy 'systemctl' files

- PKI TRAC Ticket #832 - Remove legacy 'systemctl' files . . .

2 files changed, 28 insertions, 13 deletions

diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index 57583fdcf..d55bd82bf 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -115,13 +115,15 @@ public class DonePanel extends WizardPanelBase {
 
         String initDaemon = "";
         if (type.equals("CA")) {
-            initDaemon = "pki-cad";
+            initDaemon = "<pki_ca_instance_name>";
         } else if (type.equals("KRA")) {
-            initDaemon = "pki-krad";
+            initDaemon = "<pki_kra_instance_name>";
         } else if (type.equals("OCSP")) {
-            initDaemon = "pki-ocspd";
+            initDaemon = "<pki_ocsp_instance_name>";
         } else if (type.equals("TKS")) {
-            initDaemon = "pki-tksd";
+            initDaemon = "<pki_tks_instance_name>";
+        } else if (type.equals("TPS")) {
+            initDaemon = "<pki_tps_instance_name>";
         }
         String os = System.getProperty("os.name");
         if (os.equalsIgnoreCase("Linux")) {
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
index 1ae4c3397..3bc8169bb 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
@@ -96,12 +96,12 @@ public class SecurityDomainPanel extends WizardPanelBase {
         String errorString = "";
         String default_admin_url = "";
         String name = "";
-        String systemdService = "";
+        String systemdInstanceId = "";
 
         try {
             default_admin_url = config.getString("preop.securitydomain.admin_url", "");
             name = config.getString("preop.securitydomain.name", "");
-            systemdService = config.getString("pkicreate.systemd.servicename", "");
+            systemdInstanceId = config.getString("service.instanceID", "");
         } catch (Exception e) {
             CMS.debug(e.toString());
         }
@@ -208,13 +208,13 @@ public class SecurityDomainPanel extends WizardPanelBase {
         }
 
         // Information for "existing" Security Domain CAs
-        String initDaemon = "pki-cad";
+        String initDaemon = "<pki_ca_instance_name>";
         String instanceId = "<security_domain_instance_name>";
         String os = System.getProperty("os.name");
         if (os.equalsIgnoreCase("Linux")) {
-            if (!systemdService.equals("")) {
-                context.put("initCommand", "/usr/bin/pkicontrol");
-                context.put("instanceId", "ca " + systemdService);
+            if (!systemdInstanceId.equals("")) {
+                context.put("initCommand", "/usr/bin/pkidaemon");
+                context.put("instanceId", "tomcat " + systemdInstanceId);
             } else {
                 context.put("initCommand", "/sbin/service " + initDaemon);
                 context.put("instanceId", instanceId);
@@ -451,12 +451,25 @@ public class SecurityDomainPanel extends WizardPanelBase {
         }
 
         // Information for "existing" Security Domain CAs
-        String initDaemon = "pki-cad";
+        String initDaemon = "<pki_ca_instance_name>";
         String instanceId = "<security_domain_instance_name>";
         String os = System.getProperty("os.name");
+        String systemdInstanceId = "";
+
+        try {
+            systemdInstanceId = config.getString("service.instanceID", "");
+        } catch (Exception e) {
+            CMS.debug(e.toString());
+        }
+
         if (os.equalsIgnoreCase("Linux")) {
-            context.put("initCommand", "/sbin/service " + initDaemon);
-            context.put("instanceId", instanceId);
+            if (!systemdInstanceId.equals("")) {
+                context.put("initCommand", "/usr/bin/pkidaemon");
+                context.put("instanceId", "tomcat " + systemdInstanceId);
+            } else {
+                context.put("initCommand", "/sbin/service " + initDaemon);
+                context.put("instanceId", instanceId);
+            }
         } else {
             /* default case:  e. g. - ( os.equalsIgnoreCase( "SunOS" ) */
             context.put("initCommand", "/etc/init.d/" + initDaemon);