diff options
| -rw-r--r-- | ipaplatform/base/paths.py | 1 | ||||
| -rw-r--r-- | ipaserver/install/dsinstance.py | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index bbf6b5387..a30e6b33b 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -157,7 +157,6 @@ class BasePathNamespace(object): PKCS12EXPORT = "/usr/bin/PKCS12Export" CERTUTIL = "/usr/bin/certutil" CHROMIUM_BROWSER = "/usr/bin/chromium-browser" - DS_NEWINST_PL = "/usr/bin/ds_newinst.pl" FIREFOX = "/usr/bin/firefox" GETCERT = "/usr/bin/getcert" GPG = "/usr/bin/gpg" diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index f76378ea1..9a90e99db 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -551,12 +551,12 @@ class DsInstance(service.Service): inf_fd = ipautil.write_tmp_file(inf_txt) inf_txt = re.sub(r"RootDNPwd=.*\n", "", inf_txt) root_logger.debug(inf_txt) - if ipautil.file_exists(paths.SETUP_DS_PL): - args = [paths.SETUP_DS_PL, "--silent", "--logfile", "-", "-f", inf_fd.name] - root_logger.debug("calling setup-ds.pl") - else: - args = [paths.DS_NEWINST_PL, inf_fd.name] - root_logger.debug("calling ds_newinst.pl") + args = [ + paths.SETUP_DS_PL, "--silent", + "--logfile", "-", + "-f", inf_fd.name, + ] + root_logger.debug("calling setup-ds.pl") try: ipautil.run(args) root_logger.debug("completed creating ds instance") |