TRAC Ticket #641 - Incorrect interface labels in pkidaemon output

1 files changed, 23 insertions, 11 deletions

diff --git a/base/server/scripts/operations b/base/server/scripts/operations
index b71893e86..35d0e5e1a 100644
--- a/base/server/scripts/operations
+++ b/base/server/scripts/operations
@@ -452,9 +452,9 @@ get_pki_status_definitions_ra()
     for port in `sed -n 's/^[ \t]*Listen[ \t][ \t]*\([^ \t][^ \t]*\)/\1/p' ${PKI_HTTPD_CONF}`; do
         PKI_UNSECURE_PORT=$port
         if [ $total_ports -eq 0 ]; then
-            echo "    Unsecure Port              = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}"
+            echo "    Unsecure URL               = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}"
         else
-            echo "ERROR: extra Unsecure Port = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}"
+            echo "ERROR: extra Unsecure URL  = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}"
         fi
         total_ports=`expr ${total_ports} + 1`
 
@@ -465,11 +465,11 @@ get_pki_status_definitions_ra()
         PKI_UNSECURE_PORT=$port
         if [ $total_ports -eq 1 ]; then
             CLIENTAUTH_PORT=$port
-            echo "    Secure Clientauth Port     = https://${PKI_HOSTNAME}:${CLIENTAUTH_PORT}"
+            echo "    Secure Clientauth URL      = https://${PKI_HOSTNAME}:${CLIENTAUTH_PORT}"
         fi
         if [ $total_ports -eq 2 ]; then
             NON_CLIENTAUTH_PORT=$port
-            echo "    Secure Non-Clientauth Port = https://${PKI_HOSTNAME}:${NON_CLIENTAUTH_PORT}"
+            echo "    Secure Non-Clientauth URL  = https://${PKI_HOSTNAME}:${NON_CLIENTAUTH_PORT}"
         fi
         total_ports=`expr ${total_ports} + 1`
 
@@ -502,12 +502,12 @@ get_pki_status_definitions_tps()
     for port in `sed -n 's/^[ \t]*Listen[ \t][ \t]*\([^ \t][^ \t]*\)/\1/p' ${PKI_HTTPD_CONF}`; do
         PKI_UNSECURE_PORT=$port
         if [ $total_ports -eq 0 ]; then
-            echo "    Unsecure Port              = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}/cgi-bin/so/enroll.cgi"
+            echo "    Unsecure URL               = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}/cgi-bin/so/enroll.cgi"
             echo "                                 (ESC Security Officer Enrollment)"
-            echo "    Unsecure Port              = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}/cgi-bin/home/index.cgi"
+            echo "    Unsecure URL               = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}/cgi-bin/home/index.cgi"
             echo "                                 (ESC Phone Home)"
         else
-            echo "ERROR: extra Unsecure Port = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}"
+            echo "ERROR: extra Unsecure URL  = http://${PKI_HOSTNAME}:${PKI_UNSECURE_PORT}"
         fi
         total_ports=`expr ${total_ports} + 1`
 
@@ -518,16 +518,16 @@ get_pki_status_definitions_tps()
         PKI_UNSECURE_PORT=$port
         if [ $total_ports -eq 1 ]; then
             CLIENTAUTH_PORT=$port
-            echo "    Secure Clientauth Port     = https://${PKI_HOSTNAME}:${CLIENTAUTH_PORT}/cgi-bin/sow/welcome.cgi"
+            echo "    Secure Clientauth URL      = https://${PKI_HOSTNAME}:${CLIENTAUTH_PORT}/cgi-bin/sow/welcome.cgi"
             echo "                                 (ESC Security Officer Workstation)"
-            echo "    Secure Clientauth Port     = https://${PKI_HOSTNAME}:${CLIENTAUTH_PORT}/tus"
+            echo "    Secure Clientauth URL      = https://${PKI_HOSTNAME}:${CLIENTAUTH_PORT}/tus"
             echo "                                 (TPS Roles - Operator/Administrator/Agent)"
         fi
         if [ $total_ports -eq 2 ]; then
             NON_CLIENTAUTH_PORT=$port
-            echo "    Secure Non-Clientauth Port = https://${PKI_HOSTNAME}:${NON_CLIENTAUTH_PORT}/cgi-bin/so/enroll.cgi"
+            echo "    Secure Non-Clientauth URL  = https://${PKI_HOSTNAME}:${NON_CLIENTAUTH_PORT}/cgi-bin/so/enroll.cgi"
             echo "                                 (ESC Security Officer Enrollment)"
-            echo "    Secure Non-Clientauth Port = https://${PKI_HOSTNAME}:${NON_CLIENTAUTH_PORT}/cgi-bin/home/index.cgi"
+            echo "    Secure Non-Clientauth URL  = https://${PKI_HOSTNAME}:${NON_CLIENTAUTH_PORT}/cgi-bin/home/index.cgi"
             echo "                                 (ESC Phone Home)"
         fi
         total_ports=`expr ${total_ports} + 1`
@@ -553,6 +553,12 @@ get_pki_status_definitions_tomcat()
     secure_ee_client_auth_port_statement="EE Client Auth Port"
     secure_admin_port_statement="Secure Admin Port"
     pki_console_port_statement="PKI Console Port"
+    unsecure_url_statement="Unsecure URL"
+    secure_agent_url_statement="Secure Agent URL"
+    secure_ee_url_statement="Secure EE URL"
+    secure_ee_client_auth_url_statement="EE Client Auth URL"
+    secure_admin_url_statement="Secure Admin URL"
+    pki_console_command_statement="PKI Console Command"
     tomcat_port_statement="Tomcat Port"
 
     # initialize looping variables
@@ -658,6 +664,12 @@ get_pki_status_definitions_tomcat()
                     [ "$head" == "$secure_admin_port_statement" ]          ||
                     [ "$head" == "$secure_ee_client_auth_port_statement" ] ||
                     [ "$head" == "$pki_console_port_statement"  ]          ||
+                    [ "$head" == "$unsecure_url_statement"      ]          ||
+                    [ "$head" == "$secure_agent_url_statement"  ]          ||
+                    [ "$head" == "$secure_ee_url_statement"     ]          ||
+                    [ "$head" == "$secure_admin_url_statement"  ]          ||
+                    [ "$head" == "$secure_ee_client_auth_url_statement" ]  ||
+                    [ "$head" == "$pki_console_command_statement"  ]       ||
                     [ "$head" == "$tomcat_port_statement"       ] ; then
                      echo "    $line"
                      total_ports=`expr ${total_ports} + 1`