diff options
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-ca-install | 4 | ||||
| -rwxr-xr-x | install/tools/ipa-replica-conncheck | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 4c778d950..fafd5d091 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -30,7 +30,6 @@ from ipaserver.install.installutils import create_replica_config from ipaserver.install.installutils import check_creds, ReplicaConfig from ipaserver.install import dsinstance, ca from ipaserver.install import cainstance, custodiainstance, service -from ipapython import dogtag from ipapython import version from ipalib import api from ipalib.constants import DOMAIN_LEVEL_0 @@ -144,7 +143,7 @@ def install_replica(safe_options, options, filename): config.host_name = api.env.host config.domain_name = api.env.domain config.dirman_password = dirman_password - config.ca_ds_port = dogtag.install_constants.DS_PORT + config.ca_ds_port = 389 config.top_dir = tempfile.mkdtemp("ipa") config.dir = config.top_dir else: @@ -184,7 +183,6 @@ def install_replica(safe_options, options, filename): custodia.get_ca_keys(config.ca_host_name, ca_data[0], ca_data[1]) CA = cainstance.CAInstance(config.realm_name, certs.NSS_DIR, - dogtag_constants=dogtag.install_constants, host_name=config.host_name, dm_password=config.dirman_password) CA.configure_replica(config.ca_host_name, diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index e4c259b7e..a67837c54 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -23,7 +23,6 @@ from __future__ import print_function from ipapython.config import IPAOptionParser from ipapython import version from ipapython import ipautil -from ipapython import dogtag from ipapython.ipautil import CalledProcessError from ipaserver.install import installutils import ipaclient.ipachangeconf @@ -325,8 +324,8 @@ def main(): if options.check_ca: # Check old Dogtag CA replication port # New installs with unified databases use main DS port (checked above) - required_ports.append(CheckedPort(dogtag.Dogtag9Constants.DS_PORT, - SOCK_STREAM, "PKI-CA: Directory Service port")) + required_ports.append(CheckedPort(7389, SOCK_STREAM, + "PKI-CA: Directory Service port")) if options.replica: print_info("Check connection from master to remote replica '%s':" % options.replica) |