[Git][NTPsec/ntpsec][master] Remove duplicative configuration examples.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
094626e7 by Eric S. Raymond at 2017-02-21T07:46:22-05:00
Remove duplicative configuration examples.

This partially addresses GitLab issue #241: two copies of the
documentation for the statistics files

Sample config files should go into etc/, not contrib/.

- - - - -


2 changed files:

- − contrib/ntp.conf.basic.sample
- − contrib/ntp.conf.log.sample


Changes:

=====================================
contrib/ntp.conf.basic.sample deleted
=====================================
--- a/contrib/ntp.conf.basic.sample
+++ /dev/null
@@ -1,59 +0,0 @@
-# /etc/ntp.conf, minimal configuration for ntpd
-# see ntp.conf(5) for help
-
-# NTP servers
-# Use some public chimers from the NTP public pool:
-# http://www.pool.ntp.org/en/
-#
-# iburst tells it to send the first few requests at 2 second intervals rather
-# than wait for the poll interval, which defaults to 64 seconds.  That greatly
-# speeds up the time for ntpd to set the system time and start responding to
-# requests.
-#
-# Notice we use the 'us' country code servers, otherwise we might get
-# pool servers from opposite sides of the planet and accuracy would likely
-# be poor.  If you are not in the USA, then it will probably work to
-# change the 'us' to your two letter country code.
-#
-# Major Internet-using countries with pools include:
-# us gb de fr ru au at ca cn jp de fi it be br cz hk
-#
-# If you don't know your country code, find it at
-#
-# https://en.wikipedia.org/wiki/ISO_3166-1
-#
-# and then try prepending it to ".pool.ntp.org" and pinging that
-# hostname. If you get a response, you can use it.
-#
-pool us.pool.ntp.org iburst
-
-# if you know of other local time servers you can add them here
-
-# By default, exchange time with everybody, but don't allow configuration.
-restrict default kod limited nomodify nopeer noquery
-restrict -6 default kod limited nomodify nopeer noquery
-
-# Local users may interrogate the NTP server more closely.
-restrict 127.0.0.1
-restrict -6 ::1
-
-# Drift file
-# the drift file allows ntpd to restart faster
-driftfile /var/lib/ntp/ntp.drift
-
-# enable basic logging
-# un-comment next two lines to enable basic logging
-#logfile /var/log/ntp.log
-#logconfig =syncall +clockall +peerall +sysall
-
-# Log detailed statistics
-# un-comment these if you will be doing performance analysis 
-#statsdir /var/log/ntpstats/
-#statistics loopstats peerstats clockstats protostats
-#filegen loopstats file loopstats type day enable
-#filegen peerstats file peerstats type day enable
-#filegen clockstats file clockstats type day enable
-#filegen protostats file protostats type day enable
-
-
-# end


=====================================
contrib/ntp.conf.log.sample deleted
=====================================
--- a/contrib/ntp.conf.log.sample
+++ /dev/null
@@ -1,59 +0,0 @@
-# /etc/ntp.conf, minimal configuration, with statistics logging, for ntpd
-# see ntp.conf(5) for help
-
-# NTP servers
-# Use some public chimers from the NTP public pool:
-# http://www.pool.ntp.org/en/
-#
-# iburst tells it to send the first few requests at 2 second intervals rather
-# than wait for the poll interval, which defaults to 64 seconds.  That greatly
-# speeds up the time for ntpd to set the system time and start responding to
-# requests.
-#
-# Notice we use the 'us' country code servers, otherwise we might get
-# pool servers from opposite sides of the planet and accuracy would likely
-# be poor.  If you are not in the USA, then it will probably work to
-# change the 'us' to your two letter country code.
-#
-# Major Internet-using countries with pools include:
-# us gb de fr ru au at ca cn jp de fi it be br cz hk
-#
-# If you don't know your country code, find it at
-#
-# https://en.wikipedia.org/wiki/ISO_3166-1
-#
-# and then try prepending it to ".pool.ntp.org" and pinging that
-# hostname. If you get a response, you can use it.
-#
-pool us.pool.ntp.org iburst
-
-# if you know of other local time servers you can add them here
-
-# By default, exchange time with everybody, but don't allow configuration.
-restrict default kod limited nomodify nopeer noquery
-restrict -6 default kod limited nomodify nopeer noquery
-
-# Local users may interrogate the NTP server more closely.
-restrict 127.0.0.1
-restrict -6 ::1
-
-# Drift file
-# the drift file allows ntpd to restart faster
-driftfile /var/lib/ntp/ntp.drift
-
-# enable basic logging
-# Comment out next two lines to disable basic logging
-logfile /var/log/ntp.log
-logconfig =syncall +clockall +peerall +sysall
-
-# Log detailed statistics
-# Comment out these if you will not be doing performance analysis 
-statsdir /var/log/ntpstats/
-statistics loopstats peerstats clockstats protostats
-filegen loopstats file loopstats type day enable
-filegen peerstats file peerstats type day enable
-filegen clockstats file clockstats type day enable
-filegen protostats file protostats type day enable
-
-
-# end



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/094626e7dcb6e0f55bea0356f6f1f011a4a29645
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170221/d72711f3/attachment.html>