diff options
| author | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-01-28 16:07:09 +0000 |
|---|---|---|
| committer | alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-01-28 16:07:09 +0000 |
| commit | 13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50 (patch) | |
| tree | 8349ad5e86fbea80e011af53d56518dea76bf11e /pki/dogtag/common-ui | |
| parent | ea85f54a756ff1e6603cdee28a90785b3f8db08d (diff) | |
| download | pki-13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50.tar.gz pki-13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50.tar.xz pki-13715dc6c17c55dd36a6c6bfe8ad12a775f5bc50.zip | |
Bugzilla BZ# 482738: selinux changes for cloning
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@199 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/dogtag/common-ui')
| -rw-r--r-- | pki/dogtag/common-ui/dogtag-pki-common-ui.spec | 4 | ||||
| -rw-r--r-- | pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec index dfcc60af0..f83aed09b 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.0.0 -%define base_release 6 +%define base_release 7 %define base_group System Environment/Base %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -222,6 +222,8 @@ rm -rf ${RPM_BUILD_ROOT} ############################################################################### %changelog +* Tue Jan 27 2009 Ade Lee <alee@redhat.com> 1.0.0-7 +- Bugzilla Bug #482738 - selinux changes needed for cloning * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org" diff --git a/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm index 9cac40a7d..8b08ed448 100644 --- a/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm +++ b/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm @@ -28,7 +28,7 @@ function performPanel() { </SCRIPT> <h2>Import Keys and Certificates</h2> <br/> -To setup a cloned subsystem, the master subsystem's keys and certificates (with the exception of the SSL server key and certificate) need to be imported. For a software token, all of these keys and certificates are stored in a single file in the PKCS #12 format which is protected by the password provided during the creation of this file. To import this PKCS #12 file, enter an appropriate path and password in the form specified below. +To setup a cloned subsystem, the master subsystem's keys and certificates (with the exception of the SSL server key and certificate) need to be imported. For a software token, all of these keys and certificates are stored in a single file in the PKCS #12 format which is protected by the password provided during the creation of this file. To import this PKCS #12 file, first copy the PKCS #12 file to the alias directory for the cloned subsystem. Then enter an appropriate filename and password in the form specified below. <p> If these keys and certificates are stored in a hardware token, the hardware token vendor needs to be consulted for information on how to import them. <p> @@ -39,7 +39,7 @@ By default, if the path is left blank, no PKCS #12 file will be imported. #end <table class="details"> <tr> - <th>Path where the PKCS #12 file(s) are located:</th> + <th>PKCS #12 filename:</th> <td><input type="text" size="40" name="path" value="$path"/></td> </tr> |