summaryrefslogtreecommitdiffstats
path: root/install/tools/ipa-server-install
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2014-08-08 10:15:26 +0200
committerPetr Viktorin <pviktori@redhat.com>2014-08-14 10:06:27 +0200
commit359dfe58b94079e1e16f4fb8960eb29b251f2cbc (patch)
tree569c616911574f8a9566c197a80ca064aab87033 /install/tools/ipa-server-install
parent4b5a4882497ce7c3ecdf8f898fc695b2309df1b5 (diff)
downloadfreeipa-359dfe58b94079e1e16f4fb8960eb29b251f2cbc.tar.gz
freeipa-359dfe58b94079e1e16f4fb8960eb29b251f2cbc.tar.xz
freeipa-359dfe58b94079e1e16f4fb8960eb29b251f2cbc.zip
Convert external CA chain to PKCS#7 before passing it to pkispawn.
https://fedorahosted.org/freeipa/ticket/4397 Reviewed-By: Petr Viktorin <pviktori@redhat.com>
Diffstat (limited to 'install/tools/ipa-server-install')
-rwxr-xr-xinstall/tools/ipa-server-install6
1 files changed, 3 insertions, 3 deletions
diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install
index dc3655b8e..a54725458 100755
--- a/install/tools/ipa-server-install
+++ b/install/tools/ipa-server-install
@@ -202,11 +202,11 @@ def parse_options():
cert_group = OptionGroup(parser, "certificate system options")
cert_group.add_option("", "--external-ca", dest="external_ca", action="store_true",
- default=False, help="Generate a CSR to be signed by an external CA")
+ default=False, help="Generate a CSR for the IPA CA certificate to be signed by an external CA")
cert_group.add_option("", "--external_cert_file", dest="external_cert_file",
- help="PEM file containing a certificate signed by the external CA")
+ help="File containing the IPA CA certificate signed by the external CA in PEM format")
cert_group.add_option("", "--external_ca_file", dest="external_ca_file",
- help="PEM file containing the external CA chain")
+ help="File containing the external CA certificate chain in PEM format")
cert_group.add_option("--no-pkinit", dest="setup_pkinit", action="store_false",
default=True, help="disables pkinit setup steps")
cert_group.add_option("--dirsrv_pkcs12", dest="dirsrv_pkcs12",