URL: https://github.com/freeipa/freeipa/pull/249 Author: frasertweedale Title: #249: Remove references to ds_newinst.pl Action: opened
PR body: """ ds_newinst.pl was removed from 389 DS over 9 years ago. Remove references to it. Fixes: https://fedorahosted.org/freeipa/ticket/6496 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/249/head:pr249 git checkout pr249
From 1e96e35e14a725cd01ecc9c5bdca895a9dd722d4 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale <ftwee...@redhat.com> Date: Thu, 17 Nov 2016 10:54:13 +1000 Subject: [PATCH] Remove references to ds_newinst.pl ds_newinst.pl was removed from 389 DS over 9 years ago. Remove references to it. Fixes: https://fedorahosted.org/freeipa/ticket/6496 --- ipaplatform/base/paths.py | 1 - 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 bbf6b53..a30e6b3 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 a604010..a54898a 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -536,12 +536,12 @@ def __create_instance(self): 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")
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
