Bugzilla Bug #505784 and 505791 - RA cert notifications incorrect

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

2 files changed, 3 insertions, 1 deletions

diff --git a/pki/base/ra/emails/mail_approve_request.vm b/pki/base/ra/emails/mail_approve_request.vm
index a20e83403..461eb4d10 100644
--- a/pki/base/ra/emails/mail_approve_request.vm
+++ b/pki/base/ra/emails/mail_approve_request.vm
@@ -7,5 +7,5 @@ for
 Subject DN: $subject_dn
 
 Import certificate at:
-https://$machineName:$securePort/ee/request/getcert.cgi?id=$request_id
+https://$machineName:$nonClientAuthSecurePort/ee/request/getcert.cgi?id=$request_id
 
diff --git a/pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm b/pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
index 1b0d6c7f4..95274bfa7 100644
--- a/pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
+++ b/pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm
@@ -53,6 +53,7 @@ sub substitute {
   my $machineName = $cfg->get("service.machineName");
   my $securePort = $cfg->get("service.securePort");
   my $unsecurePort = $cfg->get("service.unsecurePort");
+  my $nonClientAuthSecurePort = $cfg->get("service.non_clientauth_securePort");
   my $subject_dn = $req->{'subject_dn'};
 
   $line =~ s/\$mail_to/$mail_to/g;
@@ -61,6 +62,7 @@ sub substitute {
   $line =~ s/\$securePort/$securePort/g;
   $line =~ s/\$unsecurePort/$unsecurePort/g;
   $line =~ s/\$subject_dn/$subject_dn/g;
+  $line =~ s/\$nonClientAuthSecurePort/$nonClientAuthSecurePort/g;
   return $line;
 }