diff options
| author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-06-16 15:41:12 +0000 |
|---|---|---|
| committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-06-16 15:41:12 +0000 |
| commit | 638d3a921adff47c848288b22901c93463f795f0 (patch) | |
| tree | 71c66b5d6a991181861cc999dae82299eef3b198 | |
| parent | f22290c8f5a3e5469ea5c4e7e4a46be72912e103 (diff) | |
| download | pki-638d3a921adff47c848288b22901c93463f795f0.tar.gz pki-638d3a921adff47c848288b22901c93463f795f0.tar.xz pki-638d3a921adff47c848288b22901c93463f795f0.zip | |
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
| -rw-r--r-- | pki/base/ra/emails/mail_approve_request.vm | 2 | ||||
| -rw-r--r-- | pki/base/ra/lib/perl/PKI/Request/Plugin/EmailNotification.pm | 2 | ||||
| -rw-r--r-- | pki/dogtag/ra/pki-ra.spec | 4 |
3 files changed, 6 insertions, 2 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; } diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec index f0d1e11d8..ec57e6656 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 18 +%define base_release 19 %define base_group System Environment/Daemons %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -266,6 +266,8 @@ fi ############################################################################### %changelog +* Tue Jun 16 2009 Ade Lee <alee@redhat.com> 1.1.0-19 +- Bugzilla Bug #505784 and 505791 - RA cert notifications incorrect * Wed Jun 10 2009 Ade Lee <alee@redhat.com> 1.1.0-18 - Bugzilla Bug #471916 - RA: input validation * Wed Jun 10 2009 Ade Lee <alee@redhat.com> 1.1.0-17 |