[Git][NTPsec/ntpsec][master] Address GitLab issue #392: combine /etc/ntp.d and /etc/ntp-conf.d

[Eric S. Raymond]

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


Commits:
b5a96912 by Eric S. Raymond at 2017-09-20T11:15:48Z
Address GitLab issue #392: combine /etc/ntp.d and /etc/ntp-conf.d

- - - - -


8 changed files:

- etc/README
- etc/ntp-conf.d/default.conf → etc/ntp.d/default.conf
- etc/ntp-conf.d/use-gpsd-json → etc/ntp.d/use-gpsd-json
- etc/ntp-conf.d/use-gpsd-shm → etc/ntp.d/use-gpsd-shm
- etc/ntp-conf.d/use-minimal-logging → etc/ntp.d/use-minimal-logging
- etc/ntp-conf.d/use-no-remote-configuration → etc/ntp.d/use-no-remote-configuration
- etc/ntp-conf.d/use-performance-logging → etc/ntp.d/use-performance-logging
- etc/ntp-conf.d/use-pool → etc/ntp.d/use-pool


Changes:

=====================================
etc/README
=====================================
--- a/etc/README
+++ b/etc/README
@@ -3,11 +3,12 @@
 This directory contains example run-time configuration files for the
 NTP daemon, and some example startup scripts for launching it.
 
-Under ntp-conf.d, The "use-" files are modular pieces of ntp.conf
+Under ntp.d, the "use-" files are modular pieces of ntp.conf
 files that you can string together in any order for effect.  The file
 titles are clues to what they're useful for.  Each has an explanatory
-header comment.  The file "example.conf" shows what a file made out of
-use snippets is like.
+header comment.  The file "default.conf" shows what a file made out of
+use snippets is like.  This directory can be copied to /etc to
+give a sane default configuration.
 
 The rc files are start/stop scripts for NTP under System-V-style
 init. They are intended as models for distribution packagers.
@@ -16,5 +17,5 @@ The ntpd.service file is intended for use with systemd. Note that
 it assumes the waf default installation location /usr/sbin for
 ntpd; you may need to modify this for some distrbutions.
 
-Additional information can be found in the ./docs directory of the
+Additional information can be found in the ./docs subdirectory of the
 base directory.


=====================================
etc/ntp-conf.d/default.conf → etc/ntp.d/default.conf
=====================================


=====================================
etc/ntp-conf.d/use-gpsd-json → etc/ntp.d/use-gpsd-json
=====================================


=====================================
etc/ntp-conf.d/use-gpsd-shm → etc/ntp.d/use-gpsd-shm
=====================================


=====================================
etc/ntp-conf.d/use-minimal-logging → etc/ntp.d/use-minimal-logging
=====================================


=====================================
etc/ntp-conf.d/use-no-remote-configuration → etc/ntp.d/use-no-remote-configuration
=====================================


=====================================
etc/ntp-conf.d/use-performance-logging → etc/ntp.d/use-performance-logging
=====================================


=====================================
etc/ntp-conf.d/use-pool → etc/ntp.d/use-pool
=====================================



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/b5a96912a6959aa823275c1faf6baa1d4cb1a4d5

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/b5a96912a6959aa823275c1faf6baa1d4cb1a4d5
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170920/54d5ce3b/attachment.html>