installer: Stop adding distro-specific NTP servers into ntp.conf #279
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
NACK |
|
Have you tested the code? I would bet that it will remove everything except 127.127... from the list of servers. |
pspacek
suggested changes
Nov 29, 2016
| 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"] |
There was a problem hiding this comment.
Please replace the list with single value. It will simplify the code significantly (see below).
| @@ -96,9 +82,6 @@ def __write_config(self): | |||
| break | |||
| if match: | |||
| srv_vals.remove(srv) | |||
| else: | |||
There was a problem hiding this comment.
The list logic is now completely unncecessary. Please remove it and replace with a single boolean indicating if 127.127.1.0 was found or not.
pspacek
suggested changes
Dec 6, 2016
| else: | ||
| file_changed = True | ||
| line = "" | ||
| if opt[0] == "server" and opt[1] == local_srv: |
There was a problem hiding this comment.
This will blow up if a config line contains only single token. This an easily happen if your config contains some comments, e.g.
#####################################
# BEWARE: Do not touch this config! #
#####################################
|
NACK |
Distribution packaged ntpd has servers preconfigured in ntp.conf so there's no point in trying to add them again during FreeIPA server installation. Also fix the code to always put fudge line right after the local server line as required by ntpd. https://fedorahosted.org/freeipa/ticket/6486
pspacek
approved these changes
Dec 19, 2016
|
ACK |
|
Fixed upstream |
ghost
closed this
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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