mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Remove checks for ds-replication plugin
The replication plugin is no longer shipped as a separate package. Remove the code checking its existence. https://fedorahosted.org/freeipa/ticket/1815
This commit is contained in:
parent
3112822a48
commit
9ccd979f02
@ -29,7 +29,7 @@ from ipapython import ipautil
|
||||
|
||||
from ipaserver.install import dsinstance, installutils, krbinstance, service
|
||||
from ipaserver.install import bindinstance, httpinstance, ntpinstance, certs
|
||||
from ipaserver.install.replication import check_replication_plugin, replica_conn_check
|
||||
from ipaserver.install.replication import replica_conn_check
|
||||
from ipaserver.install.installutils import HostnameLocalhost, resolve_host
|
||||
from ipaserver.install.installutils import ReplicaConfig, expand_replica_info, read_replica_info
|
||||
from ipaserver.install.installutils import get_host_name
|
||||
@ -282,8 +282,6 @@ def check_bind():
|
||||
sys.exit(1)
|
||||
|
||||
def main():
|
||||
if not check_replication_plugin():
|
||||
sys.exit(1)
|
||||
safe_options, options, filename = parse_options()
|
||||
installutils.standard_logging_setup("/var/log/ipareplica-install.log", options.debug)
|
||||
logging.debug('%s was invoked with argument "%s" and options: %s' % (sys.argv[0], filename, safe_options))
|
||||
|
@ -28,7 +28,7 @@ import krbV
|
||||
from ipapython import ipautil
|
||||
from ipaserver.install import bindinstance, dsinstance, installutils, certs
|
||||
from ipaserver.install.bindinstance import add_zone, add_reverse_zone, add_fwd_rr, add_ptr_rr
|
||||
from ipaserver.install.replication import check_replication_plugin, enable_replication_version_checking
|
||||
from ipaserver.install.replication import enable_replication_version_checking
|
||||
from ipaserver.install.installutils import resolve_host
|
||||
from ipaserver.plugins.ldap2 import ldap2
|
||||
from ipapython import version
|
||||
@ -229,8 +229,6 @@ def get_dirman_password():
|
||||
|
||||
def main():
|
||||
installutils.check_server_configuration()
|
||||
if not check_replication_plugin():
|
||||
sys.exit(1)
|
||||
options, args = parse_options()
|
||||
|
||||
replica_fqdn = args[0]
|
||||
|
@ -75,21 +75,6 @@ def replica_conn_check(master_host, host_name, realm, check_ca,
|
||||
else:
|
||||
print "Connection check OK"
|
||||
|
||||
|
||||
def check_replication_plugin():
|
||||
"""
|
||||
Confirm that the 389-ds replication is installed.
|
||||
|
||||
Emit a message and return True/False
|
||||
"""
|
||||
if not os.path.exists('/usr/lib/dirsrv/plugins/libreplication-plugin.so') and \
|
||||
not os.path.exists('/usr/lib64/dirsrv/plugins/libreplication-plugin.so'):
|
||||
print "The 389-ds replication plug-in was not found on this system."
|
||||
print "Please install the 'ds-replication' package and start the installation again"
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
def enable_replication_version_checking(hostname, realm, dirman_passwd):
|
||||
"""
|
||||
Check the replication version checking plugin. If it is not
|
||||
|
Loading…
Reference in New Issue
Block a user