Thu Jul 28 12:55:36 2011 UTC ()
Remove duplicate (but commented out) entries.


(mbalmer)
diff -r1.10 -r1.11 src/etc/ntp.conf
cvs diff -r1.10 -r1.11 src/etc/ntp.conf (switch to unified diff)

--- src/etc/ntp.conf 2011/07/09 19:24:13 1.10
+++ src/etc/ntp.conf 2011/07/28 12:55:35 1.11
@@ -1,87 +1,85 @@ @@ -1,87 +1,85 @@
1# $NetBSD: ntp.conf,v 1.10 2011/07/09 19:24:13 christos Exp $ 1# $NetBSD: ntp.conf,v 1.11 2011/07/28 12:55:35 mbalmer Exp $
2# 2#
3# NetBSD default Network Time Protocol (NTP) configuration file for ntpd 3# NetBSD default Network Time Protocol (NTP) configuration file for ntpd
4 4
5# This file is intended to be both a usable default, and a Quick-Start 5# This file is intended to be both a usable default, and a Quick-Start
6# Guide. The directives and options listed here are not at all complete. 6# Guide. The directives and options listed here are not at all complete.
7# A great deal of additional documentation, including links to FAQS and 7# A great deal of additional documentation, including links to FAQS and
8# other guides, may be found on the official NTP web site, in particular 8# other guides, may be found on the official NTP web site, in particular
9# 9#
10# http://www.ntp.org/documentation.html 10# http://www.ntp.org/documentation.html
11# 11#
12 12
13# Process ID file, so that the daemon can be signalled from scripts 13# Process ID file, so that the daemon can be signalled from scripts
14 14
15pidfile /var/run/ntpd.pid 15pidfile /var/run/ntpd.pid
16 16
17# The correction calculated by ntpd(8) for the local system clock's 17# The correction calculated by ntpd(8) for the local system clock's
18# drift is stored here. 18# drift is stored here.
19 19
20driftfile /var/db/ntp.drift 20driftfile /var/db/ntp.drift
21 21
22# Suppress the syslog(3) message for each peer synchronization change. 22# Suppress the syslog(3) message for each peer synchronization change.
23 23
24logconfig -syncstatus 24logconfig -syncstatus
25 25
26# This will help minimize disruptions due to network congestion. Don't 26# This will help minimize disruptions due to network congestion. Don't
27# do this if you configure only one server! 27# do this if you configure only one server!
28 28
29tos minsane 2 29tos minsane 2
30 30
31# Set the number of tries to register with mdns. 0 means never 31# Set the number of tries to register with mdns. 0 means never
32# 32#
33mdnstries 0 33mdnstries 0
34 34
35# Hereafter should be "server" or "peer" statements to configure other 35# Hereafter should be "server" or "peer" statements to configure other
36# hosts to exchange NTP packets with. Peers should be selected in such 36# hosts to exchange NTP packets with. Peers should be selected in such
37# a way that the network path to them is symmetric (that is, the series 37# a way that the network path to them is symmetric (that is, the series
38# of links and routers used to get to the peer is the same one that the 38# of links and routers used to get to the peer is the same one that the
39# peer uses to get back. NTP assumes such symmetry in its network delay 39# peer uses to get back. NTP assumes such symmetry in its network delay
40# calculation. NTP will apply an incorrect adjustment to timestamps 40# calculation. NTP will apply an incorrect adjustment to timestamps
41# received from the peer if the path is not symmetric. This can result 41# received from the peer if the path is not symmetric. This can result
42# in clock skew (your system clock being maintained consistently wrong 42# in clock skew (your system clock being maintained consistently wrong
43# by a certain amount). 43# by a certain amount).
44# 44#
45# The best way to select symmetric peers is to make sure that the 45# The best way to select symmetric peers is to make sure that the
46# network path to them is as short as possible (this reduces the chance 46# network path to them is as short as possible (this reduces the chance
47# that there is more than one network path between you and your peer). 47# that there is more than one network path between you and your peer).
48# You can measure these distances with the traceroute(8) program. The 48# You can measure these distances with the traceroute(8) program. The
49# best place to start looking for NTP peers for your system is within 49# best place to start looking for NTP peers for your system is within
50# your own network, or at your Internet Service Provider (ISP). 50# your own network, or at your Internet Service Provider (ISP).
51# 51#
52# Ideally, you should select at least three other systems to talk NTP 52# Ideally, you should select at least three other systems to talk NTP
53# with, for an "what I tell you three times is true" effect. 53# with, for an "what I tell you three times is true" effect.
54# 54#
55 55
56#peer an.ntp.peer.goes.here 56#peer an.ntp.peer.goes.here
57#server an.ntp.server.goes.here 57#server an.ntp.server.goes.here
58 58
59# Public servers from the pool.ntp.org project. Volunteer's servers 59# Public servers from the pool.ntp.org project. Volunteer's servers
60# are dynamically assigned to the CNAMES below via DNS round-robin. 60# are dynamically assigned to the CNAMES below via DNS round-robin.
61# The pool.ntp.org project needs more volunteers! The only criteria to 61# The pool.ntp.org project needs more volunteers! The only criteria to
62# join are a nailed-up connection and a static IP address. For details, 62# join are a nailed-up connection and a static IP address. For details,
63# see the web page: 63# see the web page:
64# 64#
65# http://www.pool.ntp.org/  65# http://www.pool.ntp.org/
66# 66#
67 67
68# The country codes can help you find servers that are net-wise close. 68# The country codes can help you find servers that are net-wise close.
69# As explained above, closer is better... 69# As explained above, closer is better...
70 70
71# Northern U.S.A 71# Northern U.S.A
72#server ca.pool.ntp.org 72#server ca.pool.ntp.org
73#server us.pool.ntp.org 73#server us.pool.ntp.org
74#server us.pool.ntp.org 
75 74
76# Northern Europe 75# Northern Europe
77#server de.pool.ntp.org 76#server de.pool.ntp.org
78#server de.pool.ntp.org 
79#server dk.pool.ntp.org 77#server dk.pool.ntp.org
80 78
81# Depending on the vagaries of DNS can occasionally pull in the same 79# Depending on the vagaries of DNS can occasionally pull in the same
82# server twice. The following CNAMES are guaranteed to be disjoint, at 80# server twice. The following CNAMES are guaranteed to be disjoint, at
83# least over some short interval. 81# least over some short interval.
84 82
85server 0.pool.ntp.org 83server 0.pool.ntp.org
86server 1.pool.ntp.org 84server 1.pool.ntp.org
87server 2.pool.ntp.org 85server 2.pool.ntp.org