Minor fixes in a few configuration UI panels of RA and TPS.

Changed the status check and restart commands to systemctl.
The text $errorString will not be seen when the security domain login panel
is launched for the first time.

Ticket #452

4 files changed, 12 insertions, 21 deletions

diff --git a/base/tps/apache/docroot/tps/admin/console/config/donepanel.vm b/base/tps/apache/docroot/tps/admin/console/config/donepanel.vm
index 2aa76ff0c..3df605d69 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/donepanel.vm
+++ b/base/tps/apache/docroot/tps/admin/console/config/donepanel.vm
@@ -31,21 +31,12 @@ function performPanel() {
 #if ($errorString != "")
 <img src="/pki/images/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
 #end
-#if ($systemType == "tks")
-As 'root', restart the server on the command line by typing "$initCommand restart $instanceID". After performing this restart, the server should become operational. 
-#else
-#if ($externalCA == "true" && $systemType == "kra")
-As 'root', restart the server on the command line by typing "$initCommand restart $instanceID". Startup the administration console to add the peer CA to the Trusted Manager's Group. Make sure to add the transport certificate and connector information to the peer CA. After performing this restart, the server should become operational.
-#else
-As 'root', restart the server on the command line by typing "$initCommand
- restart $instanceID". After performing this restart, the server should become operational.
+As 'root', restart the server on the command line by typing "$restartCommand". After performing this restart, the server should become operational.
 <br/>
 Please go to the <A href="https://$host:$non_clientauth_port">services page</A> to access all of the available interfaces.
 <br/>
 Each Enterprise Security Client (ESC) talks to a TPS config URL for token management functions located at <A href="http://$host:$unsecurePort/cgi-bin/home/index.cgi">http://$host:$unsecurePort/cgi-bin/home/index.cgi</A>.
 <br/>
-#end
-#end
 <br/>
 To create additional instances, type "/usr/bin/pkicreate" on the command line.
 <br/>
diff --git a/base/tps/apache/docroot/tps/admin/console/config/securitydomainpanel.vm b/base/tps/apache/docroot/tps/admin/console/config/securitydomainpanel.vm
index 6f651f388..adb45cff6 100644
--- a/base/tps/apache/docroot/tps/admin/console/config/securitydomainpanel.vm
+++ b/base/tps/apache/docroot/tps/admin/console/config/securitydomainpanel.vm
@@ -108,7 +108,7 @@ Enter the URL to an existing security domain.
 <table>
 <tr>
 <td valign="top"><b>NOTE:&nbsp;&nbsp; </b></td>
-<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status $instanceID" from the command-line.</td>
+<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$statusCommand" from the command-line.</td>
 </tr>
 </table>
 <br/>
diff --git a/base/tps/lib/perl/PKI/TPS/DonePanel.pm b/base/tps/lib/perl/PKI/TPS/DonePanel.pm
index 3d897fca9..06c30646e 100755
--- a/base/tps/lib/perl/PKI/TPS/DonePanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/DonePanel.pm
@@ -401,19 +401,19 @@ sub display
     my $instanceID = $::config->get("service.instanceID");
 
     my $initDaemon = "pki-tpsd";
-    my $initCommand = "";
+    my $restartCommand = "";
     if( $^O eq "linux" ) {
-        $initCommand = "/sbin/service $initDaemon";
+        $restartCommand = "systemctl restart $initDaemon\@$instanceID";
     } else {
         ## default case:  e. g. - ( $^O eq "solaris" )
-        $initCommand  = "/etc/init.d/$initDaemon";
+        $restartCommand  = "/etc/init.d/$initDaemon restart $instanceID";
     }
 
     $::symbol{host}  = $machineName;
     $::symbol{unsecurePort}  = $unsecurePort;
     $::symbol{port}  = $securePort;
     $::symbol{non_clientauth_port}  = $non_clientauth_securePort;
-    $::symbol{initCommand}  = $initCommand;
+    $::symbol{restartCommand}  = $restartCommand;
     $::symbol{instanceID}  = $instanceID;
 
     $::config->deleteSubstore("preop.");
diff --git a/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm b/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
index 5301d1369..8c52d8b40 100755
--- a/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
+++ b/base/tps/lib/perl/PKI/TPS/SecurityDomainPanel.pm
@@ -133,16 +133,16 @@ sub display
     $::symbol{sdomainAdminURL} = "https://" . $hostname . ":"
                                . $default_https_admin_port;
 
-    my $initDaemon = "pki-cad";
-    my $initCommand = "";
-    my $instanceID = "&lt;security_domain_instance_name&gt; ";
+    my $initDaemon = "pki-tomcatd";
+    my $statusCommand = "";
+    my $instanceID = "&lt;security_domain_instance_name&gt;";
     if( $^O eq "linux" ) {
-        $initCommand = "/sbin/service $initDaemon";
+        $statusCommand = "systemctl status $initDaemon\@$instanceID.service";
     } else {
         ## default case:  e. g. - ( $^O eq "solaris" )
-        $initCommand  = "/etc/init.d/$initDaemon";
+        $statusCommand  = "/etc/init.d/$initDaemon status $instanceID";
     }
-    $::symbol{initCommand} = $initCommand;
+    $::symbol{statusCommand} = $statusCommand;
     $::symbol{instanceID}  = $instanceID;
     return 1;
 }