diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-05-07 22:37:08 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-05-07 22:37:08 +0000 |
commit | 466202e75665108f5c51c5d602d2afaabed4a027 (patch) | |
tree | 9e953e972da8074d7fc4dfcc02f0d1a96f57db34 /pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm | |
parent | 2963ca4c6381e7a43fff0457fb0135476874830f (diff) | |
download | pki-466202e75665108f5c51c5d602d2afaabed4a027.tar.gz pki-466202e75665108f5c51c5d602d2afaabed4a027.tar.xz pki-466202e75665108f5c51c5d602d2afaabed4a027.zip |
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@431 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm')
-rwxr-xr-x | pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm index 468a5b1c3..ce622f915 100755 --- a/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm +++ b/pki/base/ra/lib/perl/PKI/RA/SecurityDomainPanel.pm @@ -26,6 +26,7 @@ use strict; use warnings; use PKI::RA::GlobalVar; use PKI::RA::Common; +use URI::URL; use XML::Simple; use Data::Dumper; @@ -78,7 +79,7 @@ sub display $::symbol{panelname} = "Security Domain"; $::symbol{sdomainName} = "Security Domain"; my $hostname = $::config->get("service.machineName"); - $::symbol{sdomainURL} = "https://" . $hostname . ":9444"; + $::symbol{sdomainAdminURL} = "https://" . $hostname . ":9445"; return 1; } @@ -90,15 +91,22 @@ sub update &PKI::RA::Wizard::debug_log("SecurityPanel: update"); my $sdomainURL = $q->param("sdomainURL"); + my $sdomainURL_info = new URI::URL($sdomainURL); + if ($sdomainURL eq "") { &PKI::RA::Wizard::debug_log("SecurityPanel: sdomainURL not found"); - $::symbol{errorString} = "Security Domain URL not found"; + $::symbol{errorString} = "Security Domain HTTPS Admin URL not found"; return 0; } - # save url in CS.cfg + # save urls in CS.cfg &PKI::RA::Wizard::debug_log("SecurityPanel: sdomainURL=" . $sdomainURL); - $::config->put("config.sdomainURL", $sdomainURL); + $::config->put("config.sdomainAdminURL", $sdomainURL); + + # Add values necessary for 'pkiremove' . . . + $::config->put("securitydomain.select", "existing"); + $::config->put("securitydomain.host", $sdomainURL_info->host); + $::config->put("securitydomain.httpsadminport", $sdomainURL_info->port); $::config->commit(); return 1; |