diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2015-11-09 18:28:47 +0100 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-11-25 09:12:25 +0100 |
| commit | aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0 (patch) | |
| tree | 302b9ef0c8d4afbccc141f4f4b68a42295542cd8 /ipa-client | |
| parent | 5427e7a8c7216b0aa54159a668951d71fb009139 (diff) | |
| download | freeipa-aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0.tar.gz freeipa-aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0.tar.xz freeipa-aeffe2da42734655cbaedb2c4d4f9e28bd2df1c0.zip | |
install: drop support for Dogtag 9
Dogtag 9 CA and CA DS install and uninstall code was removed. Existing
Dogtag 9 CA and CA DS instances are disabled on upgrade.
Creating a replica of a Dogtag 9 IPA master is still supported.
https://fedorahosted.org/freeipa/ticket/5197
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipa-client')
| -rw-r--r-- | ipa-client/ipaclient/ipa_certupdate.py | 7 | ||||
| -rw-r--r-- | ipa-client/man/default.conf.5 | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ipa-client/ipaclient/ipa_certupdate.py b/ipa-client/ipaclient/ipa_certupdate.py index dcd9a1fb2..9d14f6a00 100644 --- a/ipa-client/ipaclient/ipa_certupdate.py +++ b/ipa-client/ipaclient/ipa_certupdate.py @@ -23,8 +23,8 @@ import shutil from six.moves.urllib.parse import urlsplit -from ipapython import (admintool, ipautil, ipaldap, sysrestore, dogtag, - certmonger, certdb) +from ipapython import (admintool, ipautil, ipaldap, sysrestore, certmonger, + certdb) from ipaplatform import services from ipaplatform.paths import paths from ipaplatform.tasks import tasks @@ -134,10 +134,9 @@ class CertUpdate(admintool.AdminTool): if services.knownservices.httpd.is_running(): services.knownservices.httpd.restart() - dogtag_constants = dogtag.configured_constants() nickname = 'caSigningCert cert-pki-ca' criteria = { - 'cert-database': dogtag_constants.ALIAS_DIR, + 'cert-database': paths.PKI_TOMCAT_ALIAS_DIR, 'cert-nickname': nickname, 'ca-name': 'dogtag-ipa-ca-renew-agent', } diff --git a/ipa-client/man/default.conf.5 b/ipa-client/man/default.conf.5 index c7790c823..35ce6bb9f 100644 --- a/ipa-client/man/default.conf.5 +++ b/ipa-client/man/default.conf.5 @@ -66,16 +66,16 @@ The following options are relevant for the server: Specifies the base DN to use when performing LDAP operations. The base must be in DN format (dc=example,dc=com). .TP .B ca_agent_port <port> -Specifies the secure CA agent port. The default is 9443 for Dogtag 9, and 8443 for Dogtag 10. +Specifies the secure CA agent port. The default is 8443. .TP .B ca_ee_port <port> -Specifies the secure CA end user port. The default is 9444 for Dogtag 9, and 8443 for Dogtag 10. +Specifies the secure CA end user port. The default is 8443. .TP .B ca_host <hostname> Specifies the hostname of the dogtag CA server. The default is the hostname of the IPA server. .TP .B ca_port <port> -Specifies the insecure CA end user port. The default is 9180 for Dogtag 9, and 8080 for Dogtag 10. +Specifies the insecure CA end user port. The default is 8080. .TP .B context <context> Specifies the context that IPA is being executed in. IPA may operate differently depending on the context. The current defined contexts are cli and server. Additionally this value is used to load /etc/ipa/\fBcontext\fR.conf to provide context\-specific configuration. For example, if you want to always perform client requests in verbose mode but do not want to have verbose enabled on the server, add the verbose option to \fI/etc/ipa/cli.conf\fR. |