|
|
|
From 08cf035923b4eff6698d37948bb25b1414432b7a Mon Sep 17 00:00:00 2001
|
|
|
|
From: Sergey Cherevko <s.cherevko@msvsphere.ru>
|
|
|
|
Date: Wed, 30 Aug 2023 17:02:52 +0300
|
|
|
|
Subject: [PATCH] Synchronize time via Russian NTP servers
|
|
|
|
|
|
|
|
---
|
|
|
|
FAQ | 10 +++++-----
|
|
|
|
INSTALL | 4 ++--
|
|
|
|
doc/chrony.conf.adoc | 9 ++++-----
|
|
|
|
doc/chrony.conf.man.in | 12 +++++-------
|
|
|
|
doc/faq.adoc | 10 +++++-----
|
|
|
|
doc/installation.adoc | 4 ++--
|
|
|
|
examples/chrony.conf.example1 | 4 ++--
|
|
|
|
examples/chrony.conf.example2 | 6 +++---
|
|
|
|
examples/chrony.conf.example3 | 4 ++--
|
|
|
|
9 files changed, 30 insertions(+), 33 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/FAQ b/FAQ
|
|
|
|
index d68f885..5672baa 100644
|
|
|
|
--- a/FAQ
|
|
|
|
+++ b/FAQ
|
|
|
|
@@ -105,10 +105,10 @@ next boot from the RTC, the rtcsync directive enables a mode in which the
|
|
|
|
system time is periodically copied to the RTC. It is supported on Linux and
|
|
|
|
macOS.
|
|
|
|
|
|
|
|
-If you wanted to use public NTP servers from the pool.ntp.org project, the
|
|
|
|
+If you wanted to use public NTP servers from the https://www.vniiftri.ru/ project, the
|
|
|
|
minimal chrony.conf file could be:
|
|
|
|
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
makestep 1 3
|
|
|
|
rtcsync
|
|
|
|
@@ -380,7 +380,7 @@ the -Q option it will print the measured offset without setting the clock. If
|
|
|
|
you do not want to use a configuration file, NTP servers can be specified on
|
|
|
|
the command line. For example:
|
|
|
|
|
|
|
|
-# chronyd -q 'pool pool.ntp.org iburst'
|
|
|
|
+# chronyd -q 'pool ntp1.vniiftri.ru iburst'
|
|
|
|
|
|
|
|
The command above would normally take about 5 seconds if the servers were well
|
|
|
|
synchronised and responding to all requests. If not synchronised or responding,
|
|
|
|
@@ -391,7 +391,7 @@ option to one (supported since chrony version 4.0), and a timeout can be
|
|
|
|
specified with the -t option. The following command would take only up to about
|
|
|
|
one second.
|
|
|
|
|
|
|
|
-# chronyd -q -t 1 'server pool.ntp.org iburst maxsamples 1'
|
|
|
|
+# chronyd -q -t 1 'server ntp1.vniiftri.ru iburst maxsamples 1'
|
|
|
|
|
|
|
|
It is not recommended to run chronyd with the -q option periodically (e.g. from
|
|
|
|
a cron job) as a replacement for the daemon mode, because it performs
|
|
|
|
@@ -454,7 +454,7 @@ same server instance.
|
|
|
|
|
|
|
|
An example configuration of the client instance could be
|
|
|
|
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
allow 127.0.0.1
|
|
|
|
port 11123
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
diff --git a/INSTALL b/INSTALL
|
|
|
|
index 656537a..1dcbce2 100644
|
|
|
|
--- a/INSTALL
|
|
|
|
+++ b/INSTALL
|
|
|
|
@@ -116,10 +116,10 @@ make install-docs
|
|
|
|
Now that the software is successfully installed, the next step is to set up a
|
|
|
|
configuration file. The default location of the file is /etc/chrony.conf.
|
|
|
|
Several examples of configuration with comments are included in the examples
|
|
|
|
-directory. Suppose you want to use public NTP servers from the pool.ntp.org
|
|
|
|
+directory. Suppose you want to use public NTP servers from the https://www.vniiftri.ru/
|
|
|
|
project as your time reference. A minimal useful configuration file could be
|
|
|
|
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
makestep 1.0 3
|
|
|
|
rtcsync
|
|
|
|
|
|
|
|
diff --git a/doc/chrony.conf.adoc b/doc/chrony.conf.adoc
|
|
|
|
index 21d2ce6..d41cfbd 100644
|
|
|
|
--- a/doc/chrony.conf.adoc
|
|
|
|
+++ b/doc/chrony.conf.adoc
|
|
|
|
@@ -334,7 +334,7 @@ source with a newly resolved address of the name.
|
|
|
|
An example of the *pool* directive is
|
|
|
|
+
|
|
|
|
----
|
|
|
|
-pool pool.ntp.org iburst maxsources 3
|
|
|
|
+pool ntp1.vniiftri.ru iburst maxsources 3
|
|
|
|
----
|
|
|
|
|
|
|
|
[[peer]]*peer* _hostname_ [_option_]...::
|
|
|
|
@@ -2621,7 +2621,7 @@ the following methods:
|
|
|
|
stratum 1 and stratum 2 servers. You should find one or more servers that are
|
|
|
|
near to you. Check that their access policy allows you to use their
|
|
|
|
facilities.
|
|
|
|
-* Use public servers from the https://www.pool.ntp.org/[pool.ntp.org] project.
|
|
|
|
+* Use public servers from the https://www.vniiftri.ru/[ntp1.vniiftri.ru] project.
|
|
|
|
|
|
|
|
Assuming that your NTP servers are called _foo.example.net_, _bar.example.net_
|
|
|
|
and _baz.example.net_, your _chrony.conf_ file could contain as a minimum:
|
|
|
|
@@ -2654,7 +2654,7 @@ directive instead of multiple *server* directives. The configuration file could
|
|
|
|
in this case look like:
|
|
|
|
|
|
|
|
----
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
driftfile @CHRONYVARDIR@/drift
|
|
|
|
makestep 1.0 3
|
|
|
|
rtcsync
|
|
|
|
@@ -2912,8 +2912,7 @@ information to be saved.
|
|
|
|
|
|
|
|
=== Public NTP server
|
|
|
|
|
|
|
|
-*chronyd* can be configured to operate as a public NTP server, e.g. to join the
|
|
|
|
-https://www.pool.ntp.org/en/join.html[pool.ntp.org] project. The configuration
|
|
|
|
+*chronyd* can be configured to operate as a public NTP server. The configuration
|
|
|
|
is similar to the NTP client with permanent connection, except it needs to
|
|
|
|
allow client access from all addresses. It is recommended to find at least four
|
|
|
|
good servers (e.g. from the pool, or on the NTP homepage). If the server has a
|
|
|
|
diff --git a/doc/chrony.conf.man.in b/doc/chrony.conf.man.in
|
|
|
|
index 8713321..795f4b3 100644
|
|
|
|
--- a/doc/chrony.conf.man.in
|
|
|
|
+++ b/doc/chrony.conf.man.in
|
|
|
|
@@ -445,7 +445,7 @@ An example of the \fBpool\fP directive is
|
|
|
|
.if n .RS 4
|
|
|
|
.nf
|
|
|
|
.fam C
|
|
|
|
-pool pool.ntp.org iburst maxsources 3
|
|
|
|
+pool ntp1.vniiftri.ru iburst maxsources 3
|
|
|
|
.fam
|
|
|
|
.fi
|
|
|
|
.if n .RE
|
|
|
|
@@ -4124,7 +4124,7 @@ facilities.
|
|
|
|
. IP \(bu 2.3
|
|
|
|
.\}
|
|
|
|
Use public servers from the \c
|
|
|
|
-.URL "https://www.pool.ntp.org/" "pool.ntp.org" ""
|
|
|
|
+.URL "https://www.vniiftri.ru/" "www.vniiftri.ru" ""
|
|
|
|
project.
|
|
|
|
.RE
|
|
|
|
.sp
|
|
|
|
@@ -4169,7 +4169,7 @@ in this case look like:
|
|
|
|
.if n .RS 4
|
|
|
|
.nf
|
|
|
|
.fam C
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
driftfile @CHRONYVARDIR@/drift
|
|
|
|
makestep 1.0 3
|
|
|
|
rtcsync
|
|
|
|
@@ -4465,9 +4465,7 @@ before the final SIGKILL; the SIGTERM causes the measurement histories and RTC
|
|
|
|
information to be saved.
|
|
|
|
.SS "Public NTP server"
|
|
|
|
.sp
|
|
|
|
-\fBchronyd\fP can be configured to operate as a public NTP server, e.g. to join the
|
|
|
|
-.URL "https://www.pool.ntp.org/en/join.html" "pool.ntp.org" ""
|
|
|
|
-project. The configuration
|
|
|
|
+\fBchronyd\fP can be configured to operate as a public NTP server. The configuration
|
|
|
|
is similar to the NTP client with permanent connection, except it needs to
|
|
|
|
allow client access from all addresses. It is recommended to find at least four
|
|
|
|
good servers (e.g. from the pool, or on the NTP homepage). If the server has a
|
|
|
|
@@ -4513,4 +4511,4 @@ For instructions on how to report bugs, please visit
|
|
|
|
.URL "https://chrony.tuxfamily.org/" "" "."
|
|
|
|
.SH "AUTHORS"
|
|
|
|
.sp
|
|
|
|
-chrony was written by Richard Curnow, Miroslav Lichvar, and others.
|
|
|
|
\ No newline at end of file
|
|
|
|
+chrony was written by Richard Curnow, Miroslav Lichvar, and others.
|
|
|
|
diff --git a/doc/faq.adoc b/doc/faq.adoc
|
|
|
|
index d1b4cf3..7125a7b 100644
|
|
|
|
--- a/doc/faq.adoc
|
|
|
|
+++ b/doc/faq.adoc
|
|
|
|
@@ -70,11 +70,11 @@ system time is periodically copied to the RTC. It is supported on Linux and
|
|
|
|
macOS.
|
|
|
|
|
|
|
|
If you wanted to use public NTP servers from the
|
|
|
|
-https://www.pool.ntp.org/[pool.ntp.org] project, the minimal _chrony.conf_ file
|
|
|
|
+https://www.vniiftri.ru/[ntp1.vniiftri.ru] project, the minimal _chrony.conf_ file
|
|
|
|
could be:
|
|
|
|
|
|
|
|
----
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
makestep 1 3
|
|
|
|
rtcsync
|
|
|
|
@@ -362,7 +362,7 @@ clock. If you do not want to use a configuration file, NTP servers can be
|
|
|
|
specified on the command line. For example:
|
|
|
|
|
|
|
|
----
|
|
|
|
-# chronyd -q 'pool pool.ntp.org iburst'
|
|
|
|
+# chronyd -q 'pool ntp1.vniiftri.ru iburst'
|
|
|
|
----
|
|
|
|
|
|
|
|
The command above would normally take about 5 seconds if the servers were
|
|
|
|
@@ -375,7 +375,7 @@ timeout can be specified with the `-t` option. The following command would take
|
|
|
|
only up to about one second.
|
|
|
|
|
|
|
|
----
|
|
|
|
-# chronyd -q -t 1 'server pool.ntp.org iburst maxsamples 1'
|
|
|
|
+# chronyd -q -t 1 'server ntp1.vniiftri.ru iburst maxsamples 1'
|
|
|
|
----
|
|
|
|
|
|
|
|
It is not recommended to run `chronyd` with the `-q` option periodically (e.g.
|
|
|
|
@@ -442,7 +442,7 @@ the same server instance.
|
|
|
|
An example configuration of the client instance could be
|
|
|
|
|
|
|
|
----
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
allow 127.0.0.1
|
|
|
|
port 11123
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
diff --git a/doc/installation.adoc b/doc/installation.adoc
|
|
|
|
index 35ce9bf..d8f15ae 100644
|
|
|
|
--- a/doc/installation.adoc
|
|
|
|
+++ b/doc/installation.adoc
|
|
|
|
@@ -146,11 +146,11 @@ make install-docs
|
|
|
|
Now that the software is successfully installed, the next step is to set up a
|
|
|
|
configuration file. The default location of the file is _/etc/chrony.conf_.
|
|
|
|
Several examples of configuration with comments are included in the examples
|
|
|
|
-directory. Suppose you want to use public NTP servers from the pool.ntp.org
|
|
|
|
+directory. Suppose you want to use public NTP servers from the https://www.vniiftri.ru/
|
|
|
|
project as your time reference. A minimal useful configuration file could be
|
|
|
|
|
|
|
|
----
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
makestep 1.0 3
|
|
|
|
rtcsync
|
|
|
|
----
|
|
|
|
diff --git a/examples/chrony.conf.example1 b/examples/chrony.conf.example1
|
|
|
|
index 5e93ea7..6442078 100644
|
|
|
|
--- a/examples/chrony.conf.example1
|
|
|
|
+++ b/examples/chrony.conf.example1
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
-# Use public NTP servers from the pool.ntp.org project.
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+# Use public NTP servers from the https://www.vniiftri.ru/ project.
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
|
|
|
|
# Record the rate at which the system clock gains/losses time.
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
diff --git a/examples/chrony.conf.example2 b/examples/chrony.conf.example2
|
|
|
|
index bf2bbdd..6e5a993 100644
|
|
|
|
--- a/examples/chrony.conf.example2
|
|
|
|
+++ b/examples/chrony.conf.example2
|
|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
-# Use public servers from the pool.ntp.org project.
|
|
|
|
-# Please consider joining the pool (https://www.pool.ntp.org/join.html).
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
+# Use public servers from the https://www.vniiftri.ru/ project.
|
|
|
|
+# Synchronize time via NTP servers (https://www.vniiftri.ru/catalog/services/sinkhronizatsiya-vremeni-cherez-ntp-servera/).
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
|
|
|
|
# Record the rate at which the system clock gains/losses time.
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
diff --git a/examples/chrony.conf.example3 b/examples/chrony.conf.example3
|
|
|
|
index 4e3e3a8..db9d395 100644
|
|
|
|
--- a/examples/chrony.conf.example3
|
|
|
|
+++ b/examples/chrony.conf.example3
|
|
|
|
@@ -25,13 +25,13 @@
|
|
|
|
# Provider or company have one or more NTP servers that you can specify.
|
|
|
|
# Failing that, there are a lot of public NTP servers. There is a list
|
|
|
|
# you can access at http://support.ntp.org/bin/view/Servers/WebHome or
|
|
|
|
-# you can use servers from the pool.ntp.org project.
|
|
|
|
+# you can use servers from the https://www.vniiftri.ru/ project.
|
|
|
|
|
|
|
|
! server foo.example.net iburst
|
|
|
|
! server bar.example.net iburst
|
|
|
|
! server baz.example.net iburst
|
|
|
|
|
|
|
|
-! pool pool.ntp.org iburst
|
|
|
|
+! pool ntp1.vniiftri.ru iburst
|
|
|
|
|
|
|
|
#######################################################################
|
|
|
|
### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK
|
|
|
|
--
|
|
|
|
2.39.2
|
|
|
|
|