|
|
|
|
@ -1,25 +1,36 @@
|
|
|
|
|
From 0e89d48f500c29f4370f77c438fa2ebeb80261bf Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Sergey Cherevko <s.cherevko@msvsphere.ru>
|
|
|
|
|
Date: Wed, 30 Aug 2023 17:02:52 +0300
|
|
|
|
|
From fe74e4d7dec4ba1f8ffb5b0c2713e36a1ffb1a1c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
|
|
|
|
|
Date: Mon, 10 Jun 2024 12:03:59 +0300
|
|
|
|
|
Subject: [PATCH] Synchronize time via Russian NTP servers
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
FAQ | 10 +++++-----
|
|
|
|
|
FAQ | 12 ++++++------
|
|
|
|
|
INSTALL | 4 ++--
|
|
|
|
|
doc/chrony.conf.adoc | 9 ++++-----
|
|
|
|
|
doc/chrony.conf.man.in | 12 +++++-------
|
|
|
|
|
doc/faq.adoc | 10 +++++-----
|
|
|
|
|
doc/chrony.conf.adoc | 8 ++++----
|
|
|
|
|
doc/chrony.conf.man.in | 12 ++++++------
|
|
|
|
|
doc/chronyc.adoc | 2 +-
|
|
|
|
|
doc/chronyc.man.in | 4 ++--
|
|
|
|
|
doc/faq.adoc | 12 ++++++------
|
|
|
|
|
doc/installation.adoc | 4 ++--
|
|
|
|
|
examples/chrony.conf.example1 | 11 +++++++++--
|
|
|
|
|
examples/chrony.conf.example2 | 12 +++++++++---
|
|
|
|
|
examples/chrony.conf.example3 | 4 ++--
|
|
|
|
|
9 files changed, 43 insertions(+), 33 deletions(-)
|
|
|
|
|
11 files changed, 49 insertions(+), 36 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/FAQ b/FAQ
|
|
|
|
|
index 2bbb24e..92b71d2 100644
|
|
|
|
|
index c96acfa..18687b7 100644
|
|
|
|
|
--- a/FAQ
|
|
|
|
|
+++ b/FAQ
|
|
|
|
|
@@ -110,10 +110,10 @@ next boot from the RTC, the rtcsync directive enables a mode in which the
|
|
|
|
|
@@ -101,7 +101,7 @@ poll multiple servers at the same time and detect servers having incorrect time
|
|
|
|
|
(falsetickers in the NTP terminology). It should be used only with trusted
|
|
|
|
|
reliable servers, ideally in local network.
|
|
|
|
|
|
|
|
|
|
-Using timesyncd with pool.ntp.org is problematic. The pool is very robust as a
|
|
|
|
|
+Using timesyncd with https://www.vniiftri.ru/ is problematic. The pool is very robust as a
|
|
|
|
|
whole, but the individual servers run by volunteers cannot be relied on.
|
|
|
|
|
Occasionally, servers drift away or make a step to distant past or future due
|
|
|
|
|
to misconfiguration, problematic implementation, and other bugs (e.g. in
|
|
|
|
|
@@ -141,10 +141,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.
|
|
|
|
|
|
|
|
|
|
@ -28,39 +39,39 @@ index 2bbb24e..92b71d2 100644
|
|
|
|
|
minimal chrony.conf file could be:
|
|
|
|
|
|
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
|
+pool https://www.vniiftri.ru/ iburst
|
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
|
makestep 1 3
|
|
|
|
|
rtcsync
|
|
|
|
|
@@ -392,7 +392,7 @@ the -Q option it will print the measured offset without setting the clock. If
|
|
|
|
|
@@ -433,7 +433,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'
|
|
|
|
|
+# chronyd -q 'pool https://www.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,
|
|
|
|
|
@@ -403,7 +403,7 @@ option to one (supported since chrony version 4.0), and a timeout can be
|
|
|
|
|
@@ -444,7 +444,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'
|
|
|
|
|
+# chronyd -q -t 1 'server https://www.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
|
|
|
|
|
@@ -466,7 +466,7 @@ same server instance.
|
|
|
|
|
@@ -507,7 +507,7 @@ same server instance.
|
|
|
|
|
|
|
|
|
|
An example configuration of the client instance could be
|
|
|
|
|
|
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
|
+pool https://www.vniiftri.ru/ iburst
|
|
|
|
|
allow 127.0.0.1
|
|
|
|
|
port 11123
|
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
|
diff --git a/INSTALL b/INSTALL
|
|
|
|
|
index e73dcd2..8633948 100644
|
|
|
|
|
index 9ca6e22..6f48020 100644
|
|
|
|
|
--- a/INSTALL
|
|
|
|
|
+++ b/INSTALL
|
|
|
|
|
@@ -116,10 +116,10 @@ make install-docs
|
|
|
|
|
@ -72,15 +83,15 @@ index e73dcd2..8633948 100644
|
|
|
|
|
project as your time reference. A minimal useful configuration file could be
|
|
|
|
|
|
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
|
+pool https://www.vniiftri.ru/ iburst
|
|
|
|
|
makestep 1.0 3
|
|
|
|
|
rtcsync
|
|
|
|
|
|
|
|
|
|
diff --git a/doc/chrony.conf.adoc b/doc/chrony.conf.adoc
|
|
|
|
|
index 2cf5326..f9db123 100644
|
|
|
|
|
index cb3f95c..832a97f 100644
|
|
|
|
|
--- a/doc/chrony.conf.adoc
|
|
|
|
|
+++ b/doc/chrony.conf.adoc
|
|
|
|
|
@@ -356,7 +356,7 @@ sources responding to requests. The default value is 4 and the maximum value is
|
|
|
|
|
@@ -365,7 +365,7 @@ sources responding to requests. The default value is 4 and the maximum value is
|
|
|
|
|
An example of the *pool* directive is
|
|
|
|
|
+
|
|
|
|
|
----
|
|
|
|
|
@ -89,16 +100,16 @@ index 2cf5326..f9db123 100644
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
[[peer]]*peer* _hostname_ [_option_]...::
|
|
|
|
|
@@ -2731,7 +2731,7 @@ the following methods:
|
|
|
|
|
@@ -2820,7 +2820,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:
|
|
|
|
|
@@ -2764,7 +2764,7 @@ directive instead of multiple *server* directives. The configuration file could
|
|
|
|
|
Assuming that your NTP servers are called _ntp1.example.net_, _ntp2.example.net_
|
|
|
|
|
and _ntp3.example.net_, your _chrony.conf_ file could contain as a minimum:
|
|
|
|
|
@@ -2853,7 +2853,7 @@ directive instead of multiple *server* directives. The configuration file could
|
|
|
|
|
in this case look like:
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
@ -107,70 +118,111 @@ index 2cf5326..f9db123 100644
|
|
|
|
|
driftfile @CHRONYVARDIR@/drift
|
|
|
|
|
makestep 1.0 3
|
|
|
|
|
rtcsync
|
|
|
|
|
@@ -3022,8 +3022,7 @@ information to be saved.
|
|
|
|
|
|
|
|
|
|
@@ -3112,7 +3112,7 @@ information to be saved.
|
|
|
|
|
=== Public NTP server
|
|
|
|
|
|
|
|
|
|
-*chronyd* can be configured to operate as a public NTP server, e.g. to join the
|
|
|
|
|
*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
|
|
|
|
|
+https://www.vniiftri.ru/[ntp1.vniiftri.ru] project. 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 1a51b24..5c34507 100644
|
|
|
|
|
index 66d2358..8b88b70 100644
|
|
|
|
|
--- a/doc/chrony.conf.man.in
|
|
|
|
|
+++ b/doc/chrony.conf.man.in
|
|
|
|
|
@@ -467,7 +467,7 @@ An example of the \fBpool\fP directive is
|
|
|
|
|
@@ -479,7 +479,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
|
|
|
|
|
+pool ntp1.vniiftri].ru iburst maxsources 3
|
|
|
|
|
.fam
|
|
|
|
|
.fi
|
|
|
|
|
.if n .RE
|
|
|
|
|
@@ -4502,7 +4502,7 @@ facilities.
|
|
|
|
|
@@ -4651,7 +4651,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" ""
|
|
|
|
|
+.URL "https://www.ntp1.vniiftri].ru/" "ntp1.vniiftri].ru" ""
|
|
|
|
|
project.
|
|
|
|
|
.RE
|
|
|
|
|
.sp
|
|
|
|
|
@@ -4547,7 +4547,7 @@ in this case look like:
|
|
|
|
|
@@ -4696,7 +4696,7 @@ in this case look like:
|
|
|
|
|
.if n .RS 4
|
|
|
|
|
.nf
|
|
|
|
|
.fam C
|
|
|
|
|
-pool pool.ntp.org iburst
|
|
|
|
|
+pool ntp1.vniiftri.ru iburst
|
|
|
|
|
+pool ntp1.vniiftri].ru iburst
|
|
|
|
|
driftfile @CHRONYVARDIR@/drift
|
|
|
|
|
makestep 1.0 3
|
|
|
|
|
rtcsync
|
|
|
|
|
@@ -4843,9 +4843,7 @@ before the final SIGKILL; the SIGTERM causes the measurement histories and RTC
|
|
|
|
|
information to be saved.
|
|
|
|
|
@@ -4993,8 +4993,8 @@ 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
|
|
|
|
|
\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
|
|
|
|
|
+.URL "https://www.ntp.vniiftri].ru/en/join.html" "ntp1.vniiftri].ru" ""
|
|
|
|
|
+\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
|
|
|
|
|
@@ -4891,4 +4889,4 @@ For instructions on how to report bugs, please visit
|
|
|
|
|
.URL "https://chrony.tuxfamily.org/" "" "."
|
|
|
|
|
@@ -5040,4 +5040,4 @@ For instructions on how to report bugs, please visit
|
|
|
|
|
.URL "https://chrony\-project.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/chronyc.adoc b/doc/chronyc.adoc
|
|
|
|
|
index 96a0551..d88c7dc 100644
|
|
|
|
|
--- a/doc/chronyc.adoc
|
|
|
|
|
+++ b/doc/chronyc.adoc
|
|
|
|
|
@@ -979,7 +979,7 @@ them immediately, e.g. after suspending and resuming the machine in a different
|
|
|
|
|
network.
|
|
|
|
|
+
|
|
|
|
|
Note that with pools which have more than 16 addresses, or not all IPv4 or IPv6
|
|
|
|
|
-addresses are included in a single DNS response (e.g. pool.ntp.org), this
|
|
|
|
|
+addresses are included in a single DNS response (e.g. https://www.vniiftri.ru/), this
|
|
|
|
|
command might replace the addresses even if they are still in the pool.
|
|
|
|
|
|
|
|
|
|
[[reload]]*reload* *sources*::
|
|
|
|
|
diff --git a/doc/chronyc.man.in b/doc/chronyc.man.in
|
|
|
|
|
index 4541fc6..7888eff 100644
|
|
|
|
|
--- a/doc/chronyc.man.in
|
|
|
|
|
+++ b/doc/chronyc.man.in
|
|
|
|
|
@@ -1793,7 +1793,7 @@ them immediately, e.g. after suspending and resuming the machine in a different
|
|
|
|
|
network.
|
|
|
|
|
.sp
|
|
|
|
|
Note that with pools which have more than 16 addresses, or not all IPv4 or IPv6
|
|
|
|
|
-addresses are included in a single DNS response (e.g. pool.ntp.org), this
|
|
|
|
|
+addresses are included in a single DNS response (e.g. ntp1.vniiftri.ru), this
|
|
|
|
|
command might replace the addresses even if they are still in the pool.
|
|
|
|
|
.RE
|
|
|
|
|
.sp
|
|
|
|
|
@@ -2753,4 +2753,4 @@ For instructions on how to report bugs, please visit
|
|
|
|
|
.URL "https://chrony\-project.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 1b299d2..470c451 100644
|
|
|
|
|
index 8fd350f..69b8b3e 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
|
|
|
|
|
@@ -56,7 +56,7 @@ limitations is that it cannot poll multiple servers at the same time and detect
|
|
|
|
|
servers having incorrect time (falsetickers in the NTP terminology). It should
|
|
|
|
|
be used only with trusted reliable servers, ideally in local network.
|
|
|
|
|
|
|
|
|
|
-Using `timesyncd` with `pool.ntp.org` is problematic. The pool is very
|
|
|
|
|
+Using `timesyncd` with `ntp.vniiftri.ru` is problematic. The pool is very
|
|
|
|
|
robust as a whole, but the individual servers run by volunteers cannot be
|
|
|
|
|
relied on. Occasionally, servers drift away or make a step to distant past or
|
|
|
|
|
future due to misconfiguration, problematic implementation, and other bugs
|
|
|
|
|
@@ -98,11 +98,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
|
|
|
|
|
@ -184,7 +236,7 @@ index 1b299d2..470c451 100644
|
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
|
makestep 1 3
|
|
|
|
|
rtcsync
|
|
|
|
|
@@ -371,7 +371,7 @@ clock. If you do not want to use a configuration file, NTP servers can be
|
|
|
|
|
@@ -411,7 +411,7 @@ clock. If you do not want to use a configuration file, NTP servers can be
|
|
|
|
|
specified on the command line. For example:
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
@ -193,7 +245,7 @@ index 1b299d2..470c451 100644
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
The command above would normally take about 5 seconds if the servers were
|
|
|
|
|
@@ -384,7 +384,7 @@ timeout can be specified with the `-t` option. The following command would take
|
|
|
|
|
@@ -424,7 +424,7 @@ timeout can be specified with the `-t` option. The following command would take
|
|
|
|
|
only up to about one second.
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
@ -202,7 +254,7 @@ index 1b299d2..470c451 100644
|
|
|
|
|
----
|
|
|
|
|
|
|
|
|
|
It is not recommended to run `chronyd` with the `-q` option periodically (e.g.
|
|
|
|
|
@@ -451,7 +451,7 @@ the same server instance.
|
|
|
|
|
@@ -491,7 +491,7 @@ the same server instance.
|
|
|
|
|
An example configuration of the client instance could be
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
@ -212,7 +264,7 @@ index 1b299d2..470c451 100644
|
|
|
|
|
port 11123
|
|
|
|
|
driftfile /var/lib/chrony/drift
|
|
|
|
|
diff --git a/doc/installation.adoc b/doc/installation.adoc
|
|
|
|
|
index b683911..3750f85 100644
|
|
|
|
|
index b683911..0fa1eca 100644
|
|
|
|
|
--- a/doc/installation.adoc
|
|
|
|
|
+++ b/doc/installation.adoc
|
|
|
|
|
@@ -146,11 +146,11 @@ make install-docs
|
|
|
|
|
@ -220,7 +272,7 @@ index b683911..3750f85 100644
|
|
|
|
|
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/
|
|
|
|
|
+directory. Suppose you want to use public NTP servers from the ntp1.vniiftri.ru
|
|
|
|
|
project as your time reference. A minimal useful configuration file could be
|
|
|
|
|
|
|
|
|
|
----
|
|
|
|
|
@ -269,7 +321,7 @@ index bf2bbdd..61b4576 100644
|
|
|
|
|
# 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
|
|
|
|
|
index 6d84c01..e893292 100644
|
|
|
|
|
--- a/examples/chrony.conf.example3
|
|
|
|
|
+++ b/examples/chrony.conf.example3
|
|
|
|
|
@@ -25,13 +25,13 @@
|
|
|
|
|
@ -279,9 +331,9 @@ index 4e3e3a8..db9d395 100644
|
|
|
|
|
-# 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
|
|
|
|
|
! server ntp1.example.net iburst
|
|
|
|
|
! server ntp2.example.net iburst
|
|
|
|
|
! server ntp3.example.net iburst
|
|
|
|
|
|
|
|
|
|
-! pool pool.ntp.org iburst
|
|
|
|
|
+! pool ntp1.vniiftri.ru iburst
|
|
|
|
|
@ -289,5 +341,5 @@ index 4e3e3a8..db9d395 100644
|
|
|
|
|
#######################################################################
|
|
|
|
|
### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK
|
|
|
|
|
--
|
|
|
|
|
2.41.0
|
|
|
|
|
2.39.3
|
|
|
|
|
|
|
|
|
|
|
