Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text needs

correction


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1034 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

6 files changed, 40 insertions, 14 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
index e665925b9..5b358005c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java
@@ -187,12 +187,24 @@ public class DonePanel extends WizardPanelBase {
             select = cs.getString("preop.subsystem.select", "");
         } catch (Exception e) {}
 
+        String initDaemon = "";
+        if (type.equals("CA")) {
+			initDaemon = "pki-cad";
+        } else if (type.equals("KRA")) {
+			initDaemon = "pki-krad";
+        } else if (type.equals("OCSP")) {
+			initDaemon = "pki-ocspd";
+        } else if (type.equals("TKS")) {
+			initDaemon = "pki-tksd";
+        }
         String os = System.getProperty( "os.name" );
         if( os.equalsIgnoreCase( "Linux" ) ) {
-            context.put( "initCommand", "/sbin/service " + instanceId );
+            context.put( "initCommand", "/sbin/service " + initDaemon );
+            context.put( "instanceId", instanceId );
         } else {
             /* default case:  e. g. - ( os.equalsIgnoreCase( "SunOS" ) */
-            context.put( "initCommand", "/etc/init.d/" + instanceId );
+            context.put( "initCommand", "/etc/init.d/" + initDaemon );
+            context.put( "instanceId", instanceId );
         }
         context.put("title", "Done");
         context.put("panel", "admin/console/config/donepanel.vm");
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
index 0a493df51..bfe1a1e46 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java
@@ -210,13 +210,16 @@ public class SecurityDomainPanel extends WizardPanelBase {
         }
 
         // Information for "existing" Security Domain CAs
+        String initDaemon = "pki-cad";
         String instanceId = "<security_domain_instance_name>";
         String os = System.getProperty( "os.name" );
         if( os.equalsIgnoreCase( "Linux" ) ) {
-            context.put( "initCommand", "/sbin/service " + instanceId );
+            context.put( "initCommand", "/sbin/service " + initDaemon );
+            context.put( "instanceId", instanceId );
         } else {
             /* default case:  e. g. - ( os.equalsIgnoreCase( "SunOS" ) */
-            context.put( "initCommand", "/etc/init.d/" + instanceId );
+            context.put( "initCommand", "/etc/init.d/" + initDaemon );
+            context.put( "instanceId", instanceId );
         }
     }
 
@@ -472,13 +475,16 @@ public class SecurityDomainPanel extends WizardPanelBase {
         } catch (EBaseException e) {}
 
         // Information for "existing" Security Domain CAs
+        String initDaemon = "pki-cad";
         String instanceId = "<security_domain_instance_name>";
         String os = System.getProperty( "os.name" );
         if( os.equalsIgnoreCase( "Linux" ) ) {
-            context.put( "initCommand", "/sbin/service " + instanceId );
+            context.put( "initCommand", "/sbin/service " + initDaemon );
+            context.put( "instanceId", instanceId );
         } else {
             /* default case:  e. g. - ( os.equalsIgnoreCase( "SunOS" ) */
-            context.put( "initCommand", "/etc/init.d/" + instanceId );
+            context.put( "initCommand", "/etc/init.d/" + initDaemon );
+            context.put( "instanceId", instanceId );
         }
 
         context.put("title", "Security Domain");
diff --git a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm b/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
index c76f35c98..99a2e1798 100755
--- a/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/DonePanel.pm
@@ -366,12 +366,13 @@ sub display
     my $non_clientauth_securePort = $::config->get("service.non_clientauth_securePort");
     my $instanceID = $::config->get("service.instanceID");
 
+    my $initDaemon = "pki-rad";
     my $initCommand = "";
     if( $^O eq "linux" ) {
-        $initCommand = "/sbin/service $instanceID";
+        $initCommand = "/sbin/service $initDaemon";
     } else {
         ## default case:  e. g. - ( $^O eq "solaris" )
-        $initCommand  = "/etc/init.d/$instanceID";
+        $initCommand  = "/etc/init.d/$initDaemon";
     }
 
     $::symbol{host}  = $machineName;
@@ -379,6 +380,7 @@ sub display
     $::symbol{port}  = $securePort;
     $::symbol{non_clientauth_port}  = $non_clientauth_securePort;
     $::symbol{initCommand}  = $initCommand;
+    $::symbol{instanceID}  = $instanceID;
 
     $::config->deleteSubstore("preop.");
     $::config->commit();
diff --git a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
index eb2631a9b..8094fabd5 100755
--- a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
+++ b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm
@@ -134,15 +134,17 @@ sub display
     $::symbol{sdomainAdminURL} = "https://" . $hostname . ":"
                                . $default_https_admin_port;
 
+    my $initDaemon = "pki-cad";
     my $initCommand = "";
     my $instanceID ="<security_domain_instance_name> ";
     if( $^O eq "linux" ) {
-        $initCommand = "/sbin/service $instanceID";
+        $initCommand = "/sbin/service $initDaemon";
     } else {
         ## default case:  e. g. - ( $^O eq "solaris" )
-        $initCommand  = "/etc/init.d/$instanceID";
+        $initCommand  = "/etc/init.d/$initDaemon";
     }
     $::symbol{initCommand} = $initCommand;
+    $::symbol{instanceID} = $instanceID;
     return 1;
 }
 
diff --git a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
index af5d05c53..fc33a22a8 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/DonePanel.pm
@@ -379,12 +379,13 @@ sub display
     my $non_clientauth_securePort = $::config->get("service.non_clientauth_securePort");
     my $instanceID = $::config->get("service.instanceID");
 
+    my $initDaemon = "pki-tpsd";
     my $initCommand = "";
     if( $^O eq "linux" ) {
-        $initCommand = "/sbin/service $instanceID";
+        $initCommand = "/sbin/service $initDaemon";
     } else {
         ## default case:  e. g. - ( $^O eq "solaris" )
-        $initCommand  = "/etc/init.d/$instanceID";
+        $initCommand  = "/etc/init.d/$initDaemon";
     }
 
     $::symbol{host}  = $machineName;
@@ -392,6 +393,7 @@ sub display
     $::symbol{port}  = $securePort;
     $::symbol{non_clientauth_port}  = $non_clientauth_securePort;
     $::symbol{initCommand}  = $initCommand;
+    $::symbol{instanceID}  = $instanceID;
 
     $::config->deleteSubstore("preop.");
     $::config->commit();
diff --git a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
index 382072c2b..123e95b41 100755
--- a/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
+++ b/pki/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
@@ -133,15 +133,17 @@ sub display
     $::symbol{sdomainAdminURL} = "https://" . $hostname . ":"
                                . $default_https_admin_port;
 
+    my $initDaemon = "pki-cad";
     my $initCommand = "";
     my $instanceID = "<security_domain_instance_name> ";
     if( $^O eq "linux" ) {
-        $initCommand = "/sbin/service $instanceID";
+        $initCommand = "/sbin/service $initDaemon";
     } else {
         ## default case:  e. g. - ( $^O eq "solaris" )
-        $initCommand  = "/etc/init.d/$instanceID";
+        $initCommand  = "/etc/init.d/$initDaemon";
     }
     $::symbol{initCommand} = $initCommand;
+    $::symbol{instanceID}  = $instanceID;
     return 1;
 }