diff options
| author | Fraser Tweedale <ftweedal@redhat.com> | 2016-11-16 19:59:58 +1000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-01-11 15:26:20 +0100 |
| commit | c6db493b06320455a2366945911939a605df2a73 (patch) | |
| tree | 044bceb5630e6e5b41f1f791b19a35abf2b4a0e4 /install/tools | |
| parent | db6674096c598918ea6b12ca33a96cf5e617a434 (diff) | |
| download | freeipa-c6db493b06320455a2366945911939a605df2a73.tar.gz freeipa-c6db493b06320455a2366945911939a605df2a73.tar.xz freeipa-c6db493b06320455a2366945911939a605df2a73.zip | |
installer: rename --subject to --subject-base
The --subject option is actually used to provide the "subject base".
We are also going to add an option for fully specifying the IPA CA
subject DN in a subsequent commit. So to avoid confusion, rename
--subject to --subject-base, retaining --subject as a deprecated
alias.
Part of: https://fedorahosted.org/freeipa/ticket/2614
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-ca-install | 4 | ||||
| -rw-r--r-- | install/tools/man/ipa-server-install.1 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index ca909a005..715c35b08 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -172,7 +172,7 @@ def install_replica(safe_options, options, filename): options.domain_name = config.domain_name options.dm_password = config.dirman_password options.host_name = config.host_name - options.subject = config.subject_base + options.subject_base = config.subject_base if os.path.exists(cafile): options.ca_cert_file = cafile else: @@ -201,7 +201,7 @@ def install_master(safe_options, options): options.domain_name = api.env.domain options.dm_password = dm_password options.host_name = api.env.host - options.subject = subject_base + options.subject_base = subject_base ca.install_check(True, None, options) ca.install(True, None, options) diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1 index 2249e221c..07f772ad4 100644 --- a/install/tools/man/ipa-server-install.1 +++ b/install/tools/man/ipa-server-install.1 @@ -122,8 +122,8 @@ Name of the Kerberos KDC SSL certificate to install \fB\-\-ca\-cert\-file\fR=\fIFILE\fR File containing the CA certificate of the CA which issued the Directory Server, Apache Server and Kerberos KDC certificates. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times. Use this option if the CA certificate is not present in the certificate files. .TP -\fB\-\-subject\fR=\fISUBJECT\fR -The certificate subject base (default O=REALM.NAME) +\fB\-\-subject\-base\fR=\fISUBJECT\fR +The subject base for certificates issued by IPA (default O=REALM.NAME) .TP \fB\-\-ca\-signing\-algorithm\fR=\fIALGORITHM\fR Signing algorithm of the IPA CA certificate. Possible values are SHA1withRSA, SHA256withRSA, SHA512withRSA. Default value is SHA256withRSA. Use this option with --external-ca if the external CA does not support the default signing algorithm. |