URL: https://github.com/freeipa/freeipa/pull/279 Author: dkupka Title: #279: installer: Stop adding distro-specific NTP servers into ntp.conf Action: synchronized
To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/279/head:pr279 git checkout pr279
From ceceeb67b37510779fe26902ecc1cb89d66d9d2f Mon Sep 17 00:00:00 2001 From: David Kupka <dku...@redhat.com> Date: Mon, 28 Nov 2016 15:56:30 +0100 Subject: [PATCH] installer: Stop adding distro-specific NTP servers into ntp.conf Distribution packaged ntpd has servers preconfigured in ntp.conf so there's no point in trying to add them again during FreeIPA server installation. https://fedorahosted.org/freeipa/ticket/6486 --- ipaserver/install/ntpinstance.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py index 716eb08..a8b1f61 100644 --- a/ipaserver/install/ntpinstance.py +++ b/ipaserver/install/ntpinstance.py @@ -20,7 +20,6 @@ from ipaserver.install import service from ipaserver.install import sysupgrade -from ipapython import ipautil from ipaplatform.constants import constants from ipaplatform.paths import paths from ipapython.ipa_log_manager import root_logger @@ -60,20 +59,7 @@ def __write_config(self): self.fstore.backup_file(paths.NTP_CONF) self.fstore.backup_file(paths.SYSCONFIG_NTPD) - # We use the OS variable to point it towards either the rhel - # or fedora pools. Other distros should be added in the future - # or we can get our own pool. - os = "" - if ipautil.file_exists(paths.ETC_FEDORA_RELEASE): - os = "fedora" - elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE): - os = "rhel" - srv_vals = [] - srv_vals.append("0.%s.pool.ntp.org" % os) - srv_vals.append("1.%s.pool.ntp.org" % os) - srv_vals.append("2.%s.pool.ntp.org" % os) - srv_vals.append("3.%s.pool.ntp.org" % os) srv_vals.append("127.127.1.0") fudge = ["fudge", "127.127.1.0", "stratum", "10"] @@ -96,9 +82,6 @@ def __write_config(self): break if match: srv_vals.remove(srv) - else: - file_changed = True - line = "" elif opt[0] == "fudge": if opt[0:4] == fudge[0:4]: fudge_present = True
-- 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
