|
 |
403b09 |
From c72d7d5cfbf22125defac401f7b70bd164ae0293 Mon Sep 17 00:00:00 2001
|
|
|
99b6f7 |
From: Martin Kosek <mkosek@redhat.com>
|
|
|
99b6f7 |
Date: Wed, 22 May 2013 09:59:12 +0200
|
|
|
e3ffab |
Subject: [PATCH] Remove pkinit references from tool man pages
|
|
|
99b6f7 |
|
|
|
99b6f7 |
---
|
|
|
403b09 |
install/tools/man/ipa-replica-install.1 | 12 ------------
|
|
|
e3ffab |
install/tools/man/ipa-replica-prepare.1 | 12 ------------
|
|
|
e3ffab |
install/tools/man/ipa-server-install.1 | 12 ------------
|
|
|
403b09 |
3 files changed, 36 deletions(-)
|
|
|
99b6f7 |
|
|
|
99b6f7 |
diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
|
|
|
403b09 |
index 55bae2cb77e1a1c520e0598983b8939a919a9ee9..1bc7ccd779baad3bc0bb269914fd136549c09c47 100644
|
|
|
99b6f7 |
--- a/install/tools/man/ipa-replica-install.1
|
|
|
99b6f7 |
+++ b/install/tools/man/ipa-replica-install.1
|
|
|
403b09 |
@@ -125,36 +125,24 @@ The path to LDIF file that will be used to modify configuration of dse.ldif duri
|
|
|
403b09 |
Install and configure a CA on this replica. If a CA is not configured then
|
|
|
403b09 |
certificate operations will be forwarded to a master with a CA installed.
|
|
|
99b6f7 |
.TP
|
|
|
99b6f7 |
-\fB\-\-no\-pkinit\fR
|
|
|
99b6f7 |
-Disables pkinit setup steps
|
|
|
99b6f7 |
-.TP
|
|
|
403b09 |
\fB\-\-dirsrv\-cert\-file\fR=FILE
|
|
|
403b09 |
File containing the Directory Server SSL certificate and private key
|
|
|
403b09 |
.TP
|
|
|
403b09 |
\fB\-\-http\-cert\-file\fR=FILE
|
|
|
403b09 |
File containing the Apache Server SSL certificate and private key
|
|
|
403b09 |
.TP
|
|
|
403b09 |
-\fB\-\-pkinit\-cert\-file\fR=FILE
|
|
|
403b09 |
-File containing the Kerberos KDC SSL certificate and private key
|
|
|
403b09 |
-.TP
|
|
|
403b09 |
\fB\-\-dirsrv\-pin\fR=PIN
|
|
|
403b09 |
The password to unlock the Directory Server private key
|
|
|
403b09 |
.TP
|
|
|
403b09 |
\fB\-\-http\-pin\fR=PIN
|
|
|
403b09 |
The password to unlock the Apache Server private key
|
|
|
403b09 |
.TP
|
|
|
403b09 |
-\fB\-\-pkinit\-pin\fR=PIN
|
|
|
403b09 |
-The password to unlock the Kerberos KDC private key
|
|
|
403b09 |
-.TP
|
|
|
403b09 |
\fB\-\-dirsrv\-cert\-name\fR=NAME
|
|
|
403b09 |
Name of the Directory Server SSL certificate to install
|
|
|
403b09 |
.TP
|
|
|
403b09 |
\fB\-\-http\-cert\-name\fR=NAME
|
|
|
403b09 |
Name of the Apache Server SSL certificate to install
|
|
|
403b09 |
.TP
|
|
|
403b09 |
-\fB\-\-pkinit\-cert\-name\fR=NAME
|
|
|
403b09 |
-Name of the Kerberos KDC SSL certificate to install
|
|
|
403b09 |
-.TP
|
|
|
99b6f7 |
\fB\-\-skip\-schema\-check\fR
|
|
|
99b6f7 |
Skip check for updated CA DS schema on the remote master
|
|
|
99b6f7 |
|
|
|
99b6f7 |
diff --git a/install/tools/man/ipa-replica-prepare.1 b/install/tools/man/ipa-replica-prepare.1
|
|
|
590d18 |
index 2063657f8eb4e97fc11b1abb95a892e26b4344e6..afc5408ef87ec5cf967d00dd21aa848584c7eb1e 100644
|
|
|
99b6f7 |
--- a/install/tools/man/ipa-replica-prepare.1
|
|
|
99b6f7 |
+++ b/install/tools/man/ipa-replica-prepare.1
|
|
|
590d18 |
@@ -43,27 +43,18 @@ File containing the Directory Server SSL certificate and private key. The files
|
|
|
e3ffab |
\fB\-\-http\-cert\-file\fR=\fIFILE\fR
|
|
|
e3ffab |
File containing the Apache Server SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
|
|
|
99b6f7 |
.TP
|
|
|
e3ffab |
-\fB\-\-pkinit\-cert\-file\fR=\fIFILE\fR
|
|
|
e3ffab |
-File containing the Kerberos KDC SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
|
|
|
99b6f7 |
-.TP
|
|
|
e3ffab |
\fB\-\-dirsrv\-pin\fR=\fIPIN\fR
|
|
|
e3ffab |
The password to unlock the Directory Server private key
|
|
|
99b6f7 |
.TP
|
|
|
e3ffab |
\fB\-\-http\-pin\fR=\fIPIN\fR
|
|
|
e3ffab |
The password to unlock the Apache Server private key
|
|
|
99b6f7 |
.TP
|
|
|
e3ffab |
-\fB\-\-pkinit\-pin\fR=\fIPIN\fR
|
|
|
e3ffab |
-The password to unlock the Kerberos KDC private key
|
|
|
e3ffab |
-.TP
|
|
|
e3ffab |
\fB\-\-dirsrv\-cert\-name\fR=\fINAME\fR
|
|
|
e3ffab |
Name of the Directory Server SSL certificate to install
|
|
|
e3ffab |
.TP
|
|
|
e3ffab |
\fB\-\-http\-cert\-name\fR=\fINAME\fR
|
|
|
e3ffab |
Name of the Apache Server SSL certificate to install
|
|
|
e3ffab |
.TP
|
|
|
e3ffab |
-\fB\-\-pkinit\-cert\-name\fR=\fINAME\fR
|
|
|
e3ffab |
-Name of the Kerberos KDC SSL certificate to install
|
|
|
99b6f7 |
-.TP
|
|
|
99b6f7 |
\fB\-p\fR \fIDM_PASSWORD\fR, \fB\-\-password\fR=\fIDM_PASSWORD\fR
|
|
|
99b6f7 |
Directory Manager (existing master) password
|
|
|
99b6f7 |
.TP
|
|
|
590d18 |
@@ -81,9 +72,6 @@ Do not create reverse DNS zone
|
|
|
99b6f7 |
\fB\-\-ca\fR=\fICA_FILE\fR
|
|
|
99b6f7 |
Location of CA PKCS#12 file, default /root/cacert.p12
|
|
|
99b6f7 |
.TP
|
|
|
99b6f7 |
-\fB\-\-no\-pkinit\fR
|
|
|
99b6f7 |
-Disables pkinit setup steps
|
|
|
99b6f7 |
-.TP
|
|
|
99b6f7 |
\fB\-\-debug\fR
|
|
|
99b6f7 |
Prints info log messages to the output
|
|
|
99b6f7 |
.SH "EXIT STATUS"
|
|
|
99b6f7 |
diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
|
|
|
403b09 |
index 55b49449e3c44aebfeefe5cb71d73e9abf07c5b2..697ee92f5d0b5b9ff9306e659aabe19295fc9fb9 100644
|
|
|
99b6f7 |
--- a/install/tools/man/ipa-server-install.1
|
|
|
99b6f7 |
+++ b/install/tools/man/ipa-server-install.1
|
|
|
403b09 |
@@ -96,36 +96,24 @@ Type of the external CA. Possible values are "generic", "ms-cs". Default value i
|
|
|
e3ffab |
\fB\-\-external\-cert\-file\fR=\fIFILE\fR
|
|
|
e3ffab |
File containing the IPA CA certificate and the external CA certificate chain. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times.
|
|
|
99b6f7 |
.TP
|
|
|
99b6f7 |
-\fB\-\-no\-pkinit\fR
|
|
|
99b6f7 |
-Disables pkinit setup steps
|
|
|
99b6f7 |
-.TP
|
|
|
e3ffab |
\fB\-\-dirsrv\-cert\-file\fR=\fIFILE\fR
|
|
|
e3ffab |
File containing the Directory Server SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
|
|
|
99b6f7 |
.TP
|
|
|
e3ffab |
\fB\-\-http\-cert\-file\fR=\fIFILE\fR
|
|
|
e3ffab |
File containing the Apache Server SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
|
|
|
99b6f7 |
.TP
|
|
|
e3ffab |
-\fB\-\-pkinit\-cert\-file\fR=\fIFILE\fR
|
|
|
e3ffab |
-File containing the Kerberos KDC SSL certificate and private key. The files are accepted in PEM and DER certificate, PKCS#7 certificate chain, PKCS#8 and raw private key and PKCS#12 formats. This option may be used multiple times.
|
|
|
99b6f7 |
-.TP
|
|
|
e3ffab |
\fB\-\-dirsrv\-pin\fR=\fIPIN\fR
|
|
|
e3ffab |
The password to unlock the Directory Server private key
|
|
|
99b6f7 |
.TP
|
|
|
e3ffab |
\fB\-\-http\-pin\fR=\fIPIN\fR
|
|
|
e3ffab |
The password to unlock the Apache Server private key
|
|
|
99b6f7 |
.TP
|
|
|
e3ffab |
-\fB\-\-pkinit\-pin\fR=\fIPIN\fR
|
|
|
e3ffab |
-The password to unlock the Kerberos KDC private key
|
|
|
99b6f7 |
-.TP
|
|
|
e3ffab |
\fB\-\-dirsrv\-cert\-name\fR=\fINAME\fR
|
|
|
e3ffab |
Name of the Directory Server SSL certificate to install
|
|
|
e3ffab |
.TP
|
|
|
e3ffab |
\fB\-\-http\-cert\-name\fR=\fINAME\fR
|
|
|
e3ffab |
Name of the Apache Server SSL certificate to install
|
|
|
e3ffab |
.TP
|
|
|
e3ffab |
-\fB\-\-pkinit\-cert\-name\fR=\fINAME\fR
|
|
|
e3ffab |
-Name of the Kerberos KDC SSL certificate to install
|
|
|
e3ffab |
-.TP
|
|
|
e3ffab |
\fB\-\-ca\-cert\-file\fR=\fIFILE\fR
|
|
|
e3ffab |
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.
|
|
|
e3ffab |
.TP
|
|
|
99b6f7 |
--
|
|
|
403b09 |
2.7.4
|
|
|
99b6f7 |
|