diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-10-21 15:25:21 -0400 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2011-11-16 10:26:35 +0100 |
commit | 8be0d84a599be48e837d498cec45d08cbccd3a03 (patch) | |
tree | 8ba82f1f22e39623204bd7b979c2f48129ada653 /install/tools | |
parent | 70cb8bf35550189ebaed4fe088aad653ed0781aa (diff) | |
download | freeipa-8be0d84a599be48e837d498cec45d08cbccd3a03.tar.gz freeipa-8be0d84a599be48e837d498cec45d08cbccd3a03.tar.xz freeipa-8be0d84a599be48e837d498cec45d08cbccd3a03.zip |
Don't check for 389-instances.
We no longer need to enforce that no 389-ds instances exist on an IPA
server. Checking that the ports exist should be enough.
This used to be one mechanism we used to check to see if IPA was already
installed. We have a better mechanism now.
https://fedorahosted.org/freeipa/ticket/1735
Diffstat (limited to 'install/tools')
-rwxr-xr-x | install/tools/ipa-replica-install | 19 | ||||
-rwxr-xr-x | install/tools/ipa-server-install | 31 |
2 files changed, 2 insertions, 48 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 9fddb7584..18a6c4a14 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -119,7 +119,6 @@ def set_owner(config, dir): os.chown(dir, pw.pw_uid, pw.pw_gid) def install_replica_ds(config): - dsinstance.check_existing_installation() dsinstance.check_ports() # if we have a pkcs12 file, create the cert db from @@ -249,24 +248,6 @@ def install_dns_records(config, options): object.__setattr__(api.Backend.ldap2, 'ldap_uri', cur_uri) def check_dirsrv(): - serverids = dsinstance.check_existing_installation() - if serverids: - print "" - print "An existing Directory Server has been detected." - if not ipautil.user_input("Do you wish to remove it and create a new one?", False): - print "" - print "Only a single Directory Server instance is allowed on an IPA" - print "server, the one used by IPA itself." - sys.exit(1) - - try: - ipaservices.knownservices.dirsrv.stop() - except: - pass - - for serverid in serverids: - dsinstance.erase_ds_instance_data(serverid) - (ds_unsecure, ds_secure) = dsinstance.check_ports() if not ds_unsecure or not ds_secure: print "IPA requires ports 389 and 636 for the Directory Server." diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 4c56b6617..961c86c13 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -416,24 +416,6 @@ def read_admin_password(): return admin_password def check_dirsrv(unattended): - serverids = dsinstance.check_existing_installation() - if serverids: - print "" - print "An existing Directory Server has been detected." - if unattended or not user_input("Do you wish to remove it and create a new one?", False): - print "" - print "Only a single Directory Server instance is allowed on an IPA" - print "server, the one used by IPA itself." - sys.exit(1) - - try: - ipaservices.knownservices.dirsrv.stop() - except: - pass - - for serverid in serverids: - dsinstance.erase_ds_instance_data(serverid) - (ds_unsecure, ds_secure) = dsinstance.check_ports() if not ds_unsecure or not ds_secure: print "IPA requires ports 389 and 636 for the Directory Server." @@ -505,13 +487,6 @@ def uninstall(): except CalledProcessError, e: print >>sys.stderr, "Failed to set this machine hostname back to %s (%s)." % (old_hostname, str(e)) - # Now for some sanity checking. Make sure everything was really - # uninstalled. - serverids = dsinstance.check_existing_installation() - if len(serverids): - rv = 1 - logging.error('IPA cannot be re-installed without removing existing 389-ds instance(s)') - if fstore.has_files(): logging.error('Some files have not been restored, see /var/lib/ipa/sysrestore/sysrestore.index') has_state = False @@ -690,10 +665,8 @@ def main(): print "To accept the default shown in brackets, press the Enter key." print "" - if not options.external_ca and not options.external_cert_file: - # Let it past if there is an external_cert_file defined on the chance - # that we are coming in without a cache file. - check_dirsrv(options.unattended) + # Make sure the 389-ds ports are available + check_dirsrv(options.unattended) realm_name = "" host_name = "" |