diff options
author | Martin Basti <mbasti@redhat.com> | 2015-07-01 15:05:45 +0200 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2015-07-21 17:30:10 +0200 |
commit | 92828d3cf50e00fe75ebf3ec9e0edc8b9c8eae35 (patch) | |
tree | 8d1abd73e7a8069c47fe66ae76f691a6dd713809 /ipaserver/install/bindinstance.py | |
parent | a487e42d3fb71ceb3128fb9a2055a5586c4ed851 (diff) | |
download | freeipa-92828d3cf50e00fe75ebf3ec9e0edc8b9c8eae35.tar.gz freeipa-92828d3cf50e00fe75ebf3ec9e0edc8b9c8eae35.tar.xz freeipa-92828d3cf50e00fe75ebf3ec9e0edc8b9c8eae35.zip |
DNS: check if DNS package is installed
Instead of separate checking of DNS required packages, we need just
check if IPA DNS package is installed.
https://fedorahosted.org/freeipa/ticket/4058
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
Reviewed-By: Petr Spacek <pspacek@redhat.com>
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipaserver/install/bindinstance.py')
-rw-r--r-- | ipaserver/install/bindinstance.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 2228342dc..9705e845a 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -62,25 +62,8 @@ named_conf_arg_options_template_nonstr = "%(indent)s%(name)s %(value)s;\n" named_conf_include_re = re.compile(r'\s*include\s+"(?P<path>)"\s*;') named_conf_include_template = "include \"%(path)s\";\n" -def check_inst(unattended): - has_bind = True - named = services.knownservices.named - if not os.path.exists(named.get_binary_path()): - print "BIND was not found on this system" - print ("Please install the '%s' package and start the installation again" - % named.get_package_name()) - has_bind = False - - # Also check for the LDAP BIND plug-in - if not os.path.exists(paths.BIND_LDAP_SO) and \ - not os.path.exists(paths.BIND_LDAP_SO_64): - print "The BIND LDAP plug-in was not found on this system" - print "Please install the 'bind-dyndb-ldap' package and start the installation again" - has_bind = False - - if not has_bind: - return False +def check_inst(unattended): if not unattended and os.path.exists(NAMED_CONF): msg = "Existing BIND configuration detected, overwrite?" return ipautil.user_input(msg, False) |