Appearing of the nncp.mirrors.quux.org mirror

diff --git a/doc/building.texi b/doc/building.texi
index 5bb5888367c93bd6931dc446cb6664e24a46c38c..bd26c5da6bd9b010af45a628e69a6f30e61170db 100644 (file)
--- a/doc/building.texi
+++ b/doc/building.texi
@@ -21,13 +21,13 @@ $ redo all
 
 After that you should get various @command{bin/nncp-*} binaries and
 @command{bin/hjson-cli} command (only for your convenience, not
-necessary installation). Documentation for example for
+necessary installation). For example, documentation for
 @command{nncp-bundle} command can be get with
 @command{info doc/nncp.info -n nncp-bundle}.
 
 It uses @url{http://cr.yp.to/redo.html, redo} build system for that
-examples. You can use either dozen of various implementations, or at
-least minimalistic POSIX shell @command{contrib/do} (just replace
+examples. You can use one of its various implementations, or at least
+minimalistic POSIX shell @command{contrib/do} (just replace
 @command{redo} with @command{contrib/do} in the example above) included
 in tarball. Following ones are tested to work with:
 @url{http://www.goredo.cypherpunks.ru/, goredo} (NNCP's author creation),

diff --git a/doc/download.texi b/doc/download.texi
index 944f8c5f6b38e1b03bdd57aa3047ee30e09f301f..2ffde485798d95e5c46543b02c1b4fa3f55d124c 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -2,7 +2,8 @@
 @section Prepared tarballs
 
 You can obtain releases source code prepared tarballs from the links below.
-Do not forget to check tarball @ref{Integrity, integrity}.
+Do not forget to check tarball @ref{Integrity, integrity}! Also there
+are @ref{Mirrors, mirrors} of this website.
 
 Tarballs include all necessary required libraries:
 

diff --git a/doc/index.texi b/doc/index.texi
index fc2ab374d4f686f51e9f151353452203e6fbddf7..39cc8e462a848a4d28038f99e1494ccfce3639a7 100644 (file)
--- a/doc/index.texi
+++ b/doc/index.texi
@@ -57,6 +57,7 @@ There are also articles about its usage outside this website:
 * Sync protocol: Sync
 * MultiCast Discovery: MCD
 * EBlob format: EBlob
+* Mirrors::
 * Thanks::
 * Contacts and feedback: Contacts
 * Copying conditions: Copying
@@ -84,6 +85,7 @@ There are also articles about its usage outside this website:
 @include sp.texi
 @include mcd.texi
 @include eblob.texi
+@include mirrors.texi
 @include thanks.texi
 @include contacts.texi
 

diff --git a/doc/install.texi b/doc/install.texi
index 722170d39f2ff8b15f63637aa819136bc7ff70e1..9d96e7dc05ec4147c5236b09c51017db4f5300b8 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -20,7 +20,7 @@ convenience. @url{https://www.gnu.org/software/texinfo/, Texinfo} is
 used for building documentation (although tarballs already include it).
 
 In general you must get @ref{Tarballs, the tarball}, check its
-@ref{Integrity, integrity and authenticity} and run @command{make}.
+@ref{Integrity, integrity and authenticity} and run @command{redo}.
 Look for general and platform-specific @ref{Build-instructions, build
 instructions}.
 

diff --git a/doc/mirrors.texi b/doc/mirrors.texi
new file mode 100644 (file)
index 0000000..114cbf5
--- /dev/null
+++ b/doc/mirrors.texi
@@ -0,0 +1,32 @@
+@node Mirrors
+@unnumbered Mirrors
+
+Main NNCP website is hosted on two geographically distant servers
+located in Moscow, Russian Federation. One of server's IPv6 connectivity
+is provided by Hurricane Electric tunnel broker. Only one of those
+servers supports TLS and another just proxies the traffic to it. So
+TLS-capable version has less availability. It can be authenticated
+with @url{http://ca.cypherpunks.ru/, ca.cypherpunks.ru} certificate,
+through the @url{https://datatracker.ietf.org/doc/html/rfc6698, DANE}
+record, that in turn can be authenticated with
+@url{https://dnscurve.org/, DNSCurve}-secured
+@url{http://www.stargrave.org/Trust-anchor.html, trust anchors}. Both
+@code{ca.cypherpunks.ru} and DNSCurve trust anchors are signed with
+@code{CF60 E89A 5923 1E76 E263 6422 AE1A 8109 E498 57EF}
+@url{https://en.wikipedia.org/wiki/OpenPGP, OpenPGP}
+@url{http://www.stargrave.org/Contacts.html, public key}.
+
+@table @asis
+
+@item @url{https://nncp.mirrors.quux.org/}
+
+Its creation @url{http://lists.cypherpunks.ru/archive/nncp-devel/2108/0310.html, announcement}.
+Mirror of the whole NNCP's website with all tarballs, made by John Goerzen.
+It uses @url{https://letsencrypt.org/, Let's Encrypt} certificate
+authority, so can be more easily accessible for some people. If you have
+got NNCP-peering with
+@url{http://lists.cypherpunks.ru/archive/nncp-devel/2108/0283.html, nncp.quux.org}
+node, then you can also @ref{nncp-freq, freq} the @ref{Tarballs, tarballs}
+from it.
+
+@end table

diff --git a/doc/sources.texi b/doc/sources.texi
index 990639cc97d831c082c1c4d521400d643fd3b488..9ff82a9238155b356921b29503be23d3c04c8b88 100644 (file)
--- a/doc/sources.texi
+++ b/doc/sources.texi
@@ -7,9 +7,7 @@ libraries source code. Because of that, it is recommended for porters
 to use @ref{Tarballs, tarballs} instead.
 
 @example
-$ git clone git://git.cypherpunks.ru/nncp.git
-$ cd nncp
-$ git checkout develop
+$ git clone --branch develop git://git.cypherpunks.ru/nncp.git nncp
 @end example
 
 You can also use @url{https://git.cypherpunks.ru/nncp.git}.

diff --git a/doc/thanks.texi b/doc/thanks.texi
index f4cee431d509945bff909cc6190bc89a63b83c4e..12592bc570e73043596fa9d9095af31c45b5cdbb 100644 (file)
--- a/doc/thanks.texi
+++ b/doc/thanks.texi
@@ -12,6 +12,7 @@ NNCP under Ubuntu GNU/Linux distributions and bug reports.
 feedback and NixOS package maintenance.
 
 @item @url{mailto:jgoerzen@@complete.org, John Goerzen} for his feature
-suggestions, bugreports and Debian package maintenance.
+suggestions, bugreports, Debian package and mirror maintenance, and the
+whole project popularization.
 
 @end itemize

diff --git a/makedist.sh b/makedist.sh
index 4fa4796db0fc4e6381268816f10d1c2e08c1339d..e89d1bc0dc6d4dd6c9dfbfd71a85874f8a9e9c62 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -32,8 +32,9 @@ cp ~/work/redo/minimal/do contrib/do
 cat > doc/download.texi <<EOF
 @node Tarballs
 @section Prepared tarballs
-You can obtain releases source code prepared tarballs on
-@url{http://www.nncpgo.org/}.
+You can obtain releases source code prepared tarballs from
+@url{http://www.nncpgo.org/} and from one of its
+@url{http://www.nncpgo.org/Mirrors.html, mirrors}.
 EOF
 perl -i -ne 'print unless /include pedro/' doc/index.texi doc/about.ru.texi
 perl -p -i -e 's/^(.verbatiminclude) .*$/$1 PUBKEY.asc/g' doc/integrity.texi
@@ -170,6 +171,9 @@ SHA256 hash: $hash
 GPG key ID: 0x2B25868E75A1A953 NNCP releases <releases@nncpgo.org>
 Fingerprint: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953
 
+There are mirrors where you can also get the source code tarballs:
+http://www.nncpgo.org/Mirrors.html
+
 Please send questions regarding the use of NNCP, bug reports and patches
 to mailing list: http://lists.cypherpunks.ru/nncp_002ddevel.html
 EOF
@@ -219,6 +223,9 @@ SHA256 хэш: $hash
 Идентификатор GPG ключа: 0x2B25868E75A1A953 NNCP releases <releases@nncpgo.org>
 Отпечаток: 92C2 F0AE FE73 208E 46BF  F3DE 2B25 868E 75A1 A953
 
+Есть и зеркала где вы также можете получить архивы с исходным кодом:
+http://www.nncpgo.org/Mirrors.html
+
 Пожалуйста, все вопросы касающиеся использования NNCP, отчёты об ошибках
 и патчи отправляйте в nncp-devel почтовую рассылку:
 http://lists.cypherpunks.ru/nncp_002ddevel.html