Bugzilla Bug #492735 - Configuration wizard stores certain incorrect port

values within TPS "CS.cfg" . . .
Bugzilla Bug #495597 -  Unable to access Agent page using a configured CA/KRA 
containing an HSM


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

34 files changed, 200 insertions, 45 deletions

diff --git a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
index c73a62422..a02219a08 100644
--- a/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
+++ b/pki/dogtag/ca-ui/dogtag-pki-ca-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,11 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-3
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Fri Apr 10 2009 Ade Lee <alee@redhat.com> 1.1.0-2
 - Bugzilla Bug #223353 - Values entered through web ui are not checked/escaped
 * Sat Apr 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-1
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
index 62c9cfa60..62c9cfa60 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/securitydomainlogin.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/securitydomainlogin.template
diff --git a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
index 96053b7fd..96053b7fd 100644
--- a/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/sendCookie.template
+++ b/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/sendCookie.template
diff --git a/pki/dogtag/ca/pki-ca.spec b/pki/dogtag/ca/pki-ca.spec
index df7346107..63ae4ad55 100644
--- a/pki/dogtag/ca/pki-ca.spec
+++ b/pki/dogtag/ca/pki-ca.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      6
+%define base_release      7
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -281,6 +281,11 @@ fi
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-7
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Wed Apr 22 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-6
 - Bugzilla Bug #488338 -  start/stop scripts should list all the
   available port numbers with their functionality
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
index 98af120bb..4940f029d 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      1
+%define base_release      2
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,11 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-2
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Sat Apr 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-1
 - Version update to Dogtag 1.1.0.
 * Tue Mar 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-12
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
index d6443ed96..9d3ec86b8 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/createsubsystempanel.vm
@@ -46,8 +46,20 @@ This instance can be configured as a new $systemname subsystem.
         <td><input type=text size="40" name="subsystemName" value="$subsystemName"> (e.g. - $fullsystemname)</td>
       </tr>
       <tr>
-        <th>Subsystem URL: </th>
-        <td>https://$machineName:$https_port</td>
+        <th>Subsystem HTTP EE URL (unsecure): </th>
+        <td>http://$machineName:$http_port</td>
+      </tr>
+      <tr>
+        <th>Subsystem HTTPS Agent URL (clientauth): </th>
+        <td>https://$machineName:$https_agent_port</td>
+      </tr>
+      <tr>
+        <th>Subsystem HTTPS EE URL (non-clientauth): </th>
+        <td>https://$machineName:$https_ee_port</td>
+      </tr>
+      <tr>
+        <th>Subsystem HTTPS Admin URL (non-clientauth): </th>
+        <td>https://$machineName:$https_admin_port</td>
       </tr>
     </table>
 <p>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
index 593590415..ffabfb67d 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/importadmincertpanel.vm
@@ -40,9 +40,9 @@ An administrator's certificate has been created and imported into this browser.
 <SCRIPT LANGUAGE="JavaScript">
 #if ($ca == 'true' && $import == 'true')
 if (navigator.appName == "Netscape") {
-document.writeln('<iframe scrolling=yes frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true&browser=netscape"></iframe>');
+document.writeln('<iframe scrolling=yes frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true&browser=netscape"></iframe>');
 } else {
-document.writeln('<iframe scrolling=yes frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true&browser=ie"></iframe>');
+document.writeln('<iframe scrolling=yes frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true&browser=ie"></iframe>');
 }
 #else
 #if ($import == 'true')
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
index 768e8206c..8e1cdf9cb 100755
--- a/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/importcachainpanel.vm
@@ -48,7 +48,7 @@ function importCAChain()
 
     alert("You will now be asked to import and trust the Certificate Chain from the CA. Please do so.");
 
-    importcachain.src="/ca/ee/ca/getCAChain?op=download&mimeType=application/x-x509-ca-cert";
+    importcachain.src="https://$machineName:$https_port/ca/ee/ca/getCAChain?op=download&mimeType=application/x-x509-ca-cert";
 }
 
 #if ($ca == 'true' && $import == 'true')
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
index 205e18bb5..c85ee4006 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
@@ -65,8 +65,20 @@ If no security domain exists, a new one must be created for this CA.
         <td><input type=text size="40" name="sdomainName" value="$sdomainName"> (e.g. - Dogtag Security Domain)</td>
       </tr>
       <tr>
-        <th>Security Domain URL: </th>
-        <td>https://$machineName:$https_port</td>
+        <th>Security Domain HTTP EE URL (unsecure): </th>
+        <td>http://$machineName:$http_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Agent URL (clientauth): </th>
+        <td>https://$machineName:$https_agent_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS EE URL (non-clientauth): </th>
+        <td>https://$machineName:$https_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td>https://$machineName:$https_admin_port</td>
       </tr>
     </table>
 <br/>
@@ -89,8 +101,15 @@ Enter the URL to an existing security domain.
 <br/>
     <table class="details">
       <tr>
-        <th>Security Domain URL: </th>
-        <td><input type=text size="40" name="sdomainURL" value="$sdomainURL"> (e.g. - https://hostname:port)</td>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td><input type=text size="40" name="sdomainURL" value=""> (e.g. - $sdomainAdminURL)</td>
       </tr>
     </table>
 <br/>
+<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" from the command-line.  If no Security Domain URL is shown, the CA subsystem is not a Security Domain.</td>
+</tr>
+</table>
+<br/>
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index bb9a1826a..5f3eb7650 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      9
+%define base_release      10
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -285,6 +285,11 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-10
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Fri May 1 2009 Ade Lee <alee@redhat.com> 1.1.0-9
 - Bugzilla Bug #454032 - clone ca with ssl slapd has incorrect mmr agreements from configuration wizard
 * Tue Apr 28 2009 Ade Lee <alee@redhat.com> 1.1.0-8
diff --git a/pki/dogtag/kra/pki-kra.spec b/pki/dogtag/kra/pki-kra.spec
index 7bf720f87..051dda18a 100644
--- a/pki/dogtag/kra/pki-kra.spec
+++ b/pki/dogtag/kra/pki-kra.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -288,6 +288,11 @@ fi
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-5
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Wed Apr 22 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-4
 - Bugzilla Bug #488338 -  start/stop scripts should list all the
   available port numbers with their functionality
diff --git a/pki/dogtag/migrate/pki-migrate.spec b/pki/dogtag/migrate/pki-migrate.spec
index adbbde97f..f67fa0a9f 100644
--- a/pki/dogtag/migrate/pki-migrate.spec
+++ b/pki/dogtag/migrate/pki-migrate.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      1
+%define base_release      2
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -287,6 +287,11 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-2
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Sat Apr 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-1
 - Version update to Dogtag 1.1.0.
 * Tue Feb 17 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
diff --git a/pki/dogtag/ocsp/pki-ocsp.spec b/pki/dogtag/ocsp/pki-ocsp.spec
index fabbb72e1..139f09beb 100644
--- a/pki/dogtag/ocsp/pki-ocsp.spec
+++ b/pki/dogtag/ocsp/pki-ocsp.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -297,6 +297,11 @@ fi
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-5
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Wed Apr 22 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-4
 - Bugzilla Bug #488338 -  start/stop scripts should list all the
   available port numbers with their functionality
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index e4d3da559..a9ec1b562 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      1
+%define base_release      2
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,11 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-2
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Sat Apr 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-1
 - Version update to Dogtag 1.1.0.
 * Tue Mar 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-9
diff --git a/pki/dogtag/ra-ui/shared/docroot/index.vm b/pki/dogtag/ra-ui/shared/docroot/index.vm
index 40224d660..cfc7c7207 100644
--- a/pki/dogtag/ra-ui/shared/docroot/index.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/index.vm
@@ -64,7 +64,7 @@ Certificate System RA Services Page
 <tr valign="TOP">
 <td>
 <font size=4 face="PrimaSans BT, Verdana, sans-serif">
-<li><a href="https://$machineName:$securePort/ee/index.cgi">SSL End Users Services</a></li>
+<li><a href="https://$machineName:$non_clientauth_securePort/ee/index.cgi">SSL End Users Services</a></li>
 </font>
 </td>
 </tr>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
index ff4a4a153..6bea8a184 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/cainfopanel.vm
@@ -27,7 +27,7 @@ function performPanel() {
 }
 
 </SCRIPT>
-A Certificate Authority (CA) is responsible for issuing different kinds of certificates.
+A Certificate Authority (CA) is responsible for issuing different kinds of certificates. Select an HTTPS EE URL of a CA from the list below.
 <p>
 #if ($errorString != "")
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
index 9473acd99..18af9c523 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/createsubsystempanel.vm
@@ -42,9 +42,17 @@ This instance can be configured as a new $systemname subsystem.
         <td><input type=text size="40" name="subsystemName" value="$subsystemName"> (e.g. - $fullsystemname)</td>
       </tr>
       <tr>
-        <th>Subsystem URL: </th>
+        <th>Subsystem HTTP URL (unsecure): </th>
+        <td>http://$machineName:$http_port</td>
+      </tr>
+      <tr>
+        <th>Subsystem HTTPS URL (clientauth): </th>
         <td>https://$machineName:$https_port</td>
       </tr>
+      <tr>
+        <th>Subsystem HTTPS URL (non-clientauth): </th>
+        <td>https://$machineName:$non_clientauth_https_port</td>
+      </tr>
     </table>
 <p>
 #if ($disableClone)
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
index eda7d256f..af23ff226 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
@@ -35,7 +35,7 @@ function performPanel() {
 As 'root', restart the server on the command line by typing "$initCommand
  restart". After performing this restart, the server should become operational.
 <br/>
-Please go to the <A href="https://$host:$port">service</A> page to access all of the available agent interfaces.
+Please go to the <A href="https://$host:$non_clientauth_port"><b>services page</b></A> to access all of the available interfaces.
 <br/>
 <br/>
 To create additional instances, type "/usr/bin/pkicreate" on the command line.
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
index 35f61fa3a..e4e6842ba 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/drminfopanel.vm
@@ -30,7 +30,7 @@ A Data Recovery Manager (DRM) is responsible for server-side key generation, arc
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
 <p>
 #end
-<b><input checked type=radio name=choice value="keygen">&nbsp;Connect this instance to a DRM to support server-side key generation.</b>
+<b><input checked type=radio name=choice value="keygen">&nbsp;Connect this instance to an HTTPS Agent URL of a DRM to support server-side key generation.</b>
 <p>
 <p>
     <table class="details">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
index a6f54cb37..9eb35b194 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/importadmincertpanel.vm
@@ -38,12 +38,12 @@ An administrator's certificate has been created and imported into this browser.
     <table class="details">
       <tr>
 #if ($ca == 'true' && $import == 'true')
-<iframe scrolling=no frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
 #if ($caType == 'ca' && $import == 'true')
 <iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
-<iframe scrolling=no frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #end 
 #end
 <input type="hidden" name="serialNumber" value=$serialNumber />
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
index 205e18bb5..c85ee4006 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
@@ -65,8 +65,20 @@ If no security domain exists, a new one must be created for this CA.
         <td><input type=text size="40" name="sdomainName" value="$sdomainName"> (e.g. - Dogtag Security Domain)</td>
       </tr>
       <tr>
-        <th>Security Domain URL: </th>
-        <td>https://$machineName:$https_port</td>
+        <th>Security Domain HTTP EE URL (unsecure): </th>
+        <td>http://$machineName:$http_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Agent URL (clientauth): </th>
+        <td>https://$machineName:$https_agent_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS EE URL (non-clientauth): </th>
+        <td>https://$machineName:$https_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td>https://$machineName:$https_admin_port</td>
       </tr>
     </table>
 <br/>
@@ -89,8 +101,15 @@ Enter the URL to an existing security domain.
 <br/>
     <table class="details">
       <tr>
-        <th>Security Domain URL: </th>
-        <td><input type=text size="40" name="sdomainURL" value="$sdomainURL"> (e.g. - https://hostname:port)</td>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td><input type=text size="40" name="sdomainURL" value=""> (e.g. - $sdomainAdminURL)</td>
       </tr>
     </table>
 <br/>
+<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" from the command-line.  If no Security Domain URL is shown, the CA subsystem is not a Security Domain.</td>
+</tr>
+</table>
+<br/>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
index d30144074..f4cb5eb6b 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/tksinfopanel.vm
@@ -24,7 +24,7 @@ function performPanel() {
 }
 
 </SCRIPT>
-The Token Key Service (TKS) is responsible for managing master keys that are used for establishing secure channels. Select a TKS from the list below.
+The Token Key Service (TKS) is responsible for managing master keys that are used for establishing secure channels. Select an HTTPS Agent URL of a TKS from the list below.
 <p>
 #if ($errorString != "")
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index 933f1c913..d8128e7c3 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      7
+%define base_release      8
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -266,6 +266,11 @@ fi
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-8
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Thu Apr 30 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-7
 - Bugzilla Bug #498528 -  Disable mod_revocator on RHEL since it will no
   longer work with the updated mod_nss which is required for HSMs
diff --git a/pki/dogtag/setup/pki-setup.spec b/pki/dogtag/setup/pki-setup.spec
index 726f5cdac..d38c2f7a1 100644
--- a/pki/dogtag/setup/pki-setup.spec
+++ b/pki/dogtag/setup/pki-setup.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      5
+%define base_release      6
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -217,6 +217,11 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-6
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Fri Apr 24 2009 Ade Lee <alee@redhat.com> 1.1.0-5
 - Bugzilla Bug #496332 pkicreate tps instance with -user, -group and 
   -pki_instance_root throws error
diff --git a/pki/dogtag/silent/pki-silent.spec b/pki/dogtag/silent/pki-silent.spec
index 535f5b1a6..982834245 100644
--- a/pki/dogtag/silent/pki-silent.spec
+++ b/pki/dogtag/silent/pki-silent.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -234,6 +234,11 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-3
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Tue Apr 28 2009 Ade Lee <alee@redhat.com> 1.1.0-2
 - Bugzilla Bug #493418 silent install -save_p12 option creates file mode 644
 * Sat Apr 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-1
diff --git a/pki/dogtag/tks/pki-tks.spec b/pki/dogtag/tks/pki-tks.spec
index 3ec11e2e3..3e7a0144d 100644
--- a/pki/dogtag/tks/pki-tks.spec
+++ b/pki/dogtag/tks/pki-tks.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -290,6 +290,11 @@ fi
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-5
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Wed Apr 22 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-4
 - Bugzilla Bug #488338 -  start/stop scripts should list all the
   available port numbers with their functionality
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 9b7585828..229d37358 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,11 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-3
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Tue Apr 21 2009 Ade Lee <alee@redhat.com> 1.1.0-2
 - Bugzilla Bug #496687 - TPS admin page doesn't list users added to the roles
 * Sat Apr 4 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-1
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
index 59f514787..ff9a45419 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/cainfopanel.vm
@@ -27,7 +27,7 @@ function performPanel() {
 }
 
 </SCRIPT>
-A Certificate Authority (CA) is responsible for issuing different kinds of certificates. Each Enterprise Security Client (ESC) interfaces with a TPS subsystem to request end user certificates. Consequently, to obtain these certificates, a URL to a CA that has been registered in the security domain must also be selected.
+A Certificate Authority (CA) is responsible for issuing different kinds of certificates. Each Enterprise Security Client (ESC) interfaces with a TPS subsystem to request end user certificates. Consequently, to obtain these certificates, an HTTPS EE URL to a CA that has been registered in the security domain must also be selected.
 <p>
 #if ($errorString != "")
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
index 0e9aa34bd..bb4874f0d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/createsubsystempanel.vm
@@ -46,9 +46,17 @@ This instance can be configured as a new $systemname subsystem.
         <td><input type=text size="40" name="subsystemName" value="$subsystemName"> (e.g. - $fullsystemname)</td>
       </tr>
       <tr>
-        <th>Subsystem URL: </th>
+        <th>Subsystem HTTP URL (unsecure): </th>
+        <td>http://$machineName:$http_port</td>
+      </tr>
+      <tr>
+        <th>Subsystem HTTPS URL (clientauth): </th>
         <td>https://$machineName:$https_port</td>
       </tr>
+      <tr>
+        <th>Subsystem HTTPS URL (non-clientauth): </th>
+        <td>https://$machineName:$non_clientauth_https_port</td>
+      </tr>
     </table>
 <p>
 #if ($disableClone)
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
index b4a017ecf..6c90c7715 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/drminfopanel.vm
@@ -30,7 +30,7 @@ A Data Recovery Manager (DRM) is responsible for server-side key generation, arc
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
 <p>
 #end
-<b><input checked type=radio name=choice value="keygen">&nbsp;Connect this instance to a DRM to support server-side key generation.</b>
+<b><input checked type=radio name=choice value="keygen">&nbsp;Connect this instance to the HTTPS Agent URL of a DRM to support server-side key generation.</b>
 <p>
 <p>
     <table class="details">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
index f8c93e2fb..d6df8b567 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/importadmincertpanel.vm
@@ -38,12 +38,12 @@ An administrator's certificate has been created and imported into this browser.
     <table class="details">
       <tr>
 #if ($ca == 'true' && $import == 'true')
-<iframe scrolling=no frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
 #if ($caType == 'ca' && $import == 'true')
 <iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #else
-<iframe scrolling=no frameborder=0 height=0 width=0 src="/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
+<iframe scrolling=no frameborder=0 height=0 width=0 src="https://$caHost:$caPort/ca/ee/ca/getBySerial?serialNumber=$serialNumber&importCert=true"></iframe>
 #end 
 #end
 <input type="hidden" name="serialNumber" value=$serialNumber />
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
index 44eed737e..01517256d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
@@ -65,8 +65,20 @@ If no security domain exists, a new one must be created for this CA.
         <td><input type=text size="40" name="sdomainName" value="$sdomainName"> (e.g. - Dogtag Security Domain)</td>
       </tr>
       <tr>
-        <th>Security Domain URL: </th>
-        <td>https://$machineName:$https_port</td>
+        <th>Security Domain HTTP EE URL (unsecure): </th>
+        <td>http://$machineName:$http_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Agent URL (clientauth): </th>
+        <td>https://$machineName:$https_agent_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS EE URL (non-clientauth): </th>
+        <td>https://$machineName:$https_ee_port</td>
+      </tr>
+      <tr>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td>https://$machineName:$https_admin_port</td>
       </tr>
     </table>
 <br/>
@@ -89,8 +101,15 @@ Enter the URL to an existing security domain.
 <br/>
     <table class="details">
       <tr>
-        <th>Security Domain URL: </th>
-        <td><input type=text size="40" name="sdomainURL" value="$sdomainURL"> (e.g. - https://hostname:port)</td>
+        <th>Security Domain HTTPS Admin URL (non-clientauth): </th>
+        <td><input type=text size="40" name="sdomainURL" value=""> (e.g. - $sdomainAdminURL)</td>
       </tr>
     </table>
 <br/>
+<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" from the command-line.  If no Security Domain URL is shown, the CA subsystem is not a Security Domain.</td>
+</tr>
+</table>
+<br/>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
index 22cb092b5..04a12ed18 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/tksinfopanel.vm
@@ -24,7 +24,7 @@ function performPanel() {
 }
 
 </SCRIPT>
-The Token Key Service (TKS) is responsible for managing master keys that are used for establishing secure channels. Select a TKS from the list below.
+The Token Key Service (TKS) is responsible for managing master keys that are used for establishing secure channels. Select an HTTPS Agent URL of a TKS from the list below.
 <p>
 #if ($errorString != "")
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index bc1895c2c..b0599052b 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.1.0
-%define base_release      12
+%define base_release      13
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      LGPLv2 with exceptions
@@ -313,6 +313,11 @@ fi
 ###############################################################################
 
 %changelog
+* Tue May 5 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-13
+- Bugzilla Bug #492735 -  Configuration wizard stores certain incorrect
+  port values within TPS "CS.cfg" . . .
+- Bugzilla Bug #495597 -  Unable to access Agent page using a configured
+  CA/KRA containing an HSM
 * Fri May 1  2009 Jack Magne <jmagne@redhat.com> 1.1.0-12
 - Bugzilla Bug #494983 - Can't re-enroll if policy is set to no.
 * Thu Apr 30 2009 Matthew Harmsen <mharmsen@redhat.com> 1.1.0-11