More miscellaneous cleanups

- 4c1dba27917715550fb2e6367ff20fa4efe89ac3 missed some bad words.
- da2a10115fe9b0da3365cb1edeeae241ece0d84b missed one of ARIN's TAL workarounds.
- 39053843972926d6a8b55ccaf2ae2d792255189c didn't link to the tracker properly.
- b6404ec81920c0ee8397cabedc90159795f38ed8 missed deprecated fields in examples and man.

The documentation will retain the deprecated fields until the new
release.

diff --git a/.gitignore b/.gitignore
index 427d4db16261616e3bac4a09362f318c2e348408..d2f2d13099a878d3165048a7d53f89ea3fec1013 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -101,7 +101,7 @@ tmp
 docs/_site
 docs/.jekyll-metadata
 
-# Unwanted manure shat by imbecile OSs
+# OS noise
 .DS_Store*
 ehthumbs.db
 Icon?

diff --git a/deconf.sh b/deconf.sh
index 9760359bb86b9cb23f352268b014a014e1496941..cc40fc0365ccc167b9788f4c9d852f88eba214af 100755 (executable)
--- a/deconf.sh
+++ b/deconf.sh
@@ -4,5 +4,4 @@ git clean -dfx \
        -e .settings \
        -e .metadata \
        -e Debug/ \
-       -e examples/tal/arin.tal \
        -e tmp

diff --git a/docs/index.md b/docs/index.md
index 22edb54f6d87f07d13caf69cd14ed74aa6331177..3994a19bf1b549a827e0db7a138650e612128e50 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -11,7 +11,7 @@ The FORT validator is an MIT-licensed RPKI Relying Party, offered as part of the
 
 ## Status
 
-As of 2023-06-22, development has resumed. You might want to bump your desired patches and features in the [tracker](https://github.com/NICMx/FORT-validator).
+As of 2023-06-22, development has resumed. You might want to bump your desired patches and features in the [tracker](https://github.com/NICMx/FORT-validator/issues).
 
 Version {{ site.fort-latest-version }} is the latest official release. To fetch or review it, visit the [GitHub release](https://github.com/NICMx/FORT-validator/releases/tag/{{ site.fort-latest-version }}){:target="_blank"}.
 

diff --git a/examples/config.json b/examples/config.json
index 6c10c322c4175aaa54934a030bd4f586c3ed44f2..29dbcf28549112e0dceb20717d6c825425a76bda 100644 (file)
--- a/examples/config.json
+++ b/examples/config.json
@@ -47,7 +47,6 @@
     "user-agent": "fort/1.5.0",
     "connect-timeout": 30,
     "transfer-timeout": 0,
-    "idle-timeout": 15,
     "ca-path": "/usr/local/ssl/certs"
   },
   "rsync": {

diff --git a/man/fort.8 b/man/fort.8
index 315aac117ee80b7b72fec1ed2c3350c5e818117a..308f3089f75304c2c3119bf3a69ac04a39a9d769 100644 (file)
--- a/man/fort.8
+++ b/man/fort.8
@@ -263,30 +263,6 @@ All the enabled logs will be sent to syslog, so the configured values of
 .RE
 .P
 
-.B \-\-sync-strategy=(\fIoff\fR|\fIstrict\fR|\fIroot\fR|\fIroot-except-ta\fR)
-.RS 4
-This argument \fBwill be DEPRECATED\fR. Use \fB--rsync.strategy\fR or
-\fB--rsync.enabled\fR (if rsync is meant to be disabled) instead.
-.P
-\fIrsync\fR download strategy; states the way rsync URLs are approached during
-downloads.
-.P
-Despite this argument will be deprecated, it still can be utilized. It can have
-one of four values:
-.RS 4
-- \fIoff\fR: will disable rsync execution. So, using \fB--sync-strategy=off\fR
-will be the same as \fB--rsync.enabled=false\fR.
-.br
-- \fIstrict\fR: will be the same as \fB--rsync.strategy=strict\fR.
-.br
-- \fIroot\fR: will be the same as \fB--rsync.strategy=root\fR.
-.br
-- \fIroot-except-ta\fR \fB(default value)\fR: will be the same as
-\fB--rsync.strategy=root-except-ta\fR.
-.RE
-.RE
-.P
-
 .B \-\-work-offline
 .RS 4
 If this flag is activated, Fort will disable all outgoing requests (currently
@@ -898,30 +874,6 @@ By default, the path has a NULL value.
 .RE
 .P
 
-.B \-\-rrdp.enabled=\fItrue\fR|\fIfalse\fR
-.RS 4
-This argument \fBwill be DEPRECATED\fR. Use \fB--http.enabled\fR instead.
-.RE
-.P
-
-.B \-\-rrdp.priority=\fIUNSIGNED_INTEGER\fR
-.RS 4
-This argument \fBwill be DEPRECATED\fR. Use \fB--http.priority\fR instead.
-.RE
-.P
-
-.B \-\-rrdp.retry.count=\fIUNSIGNED_INTEGER\fR
-.RS 4
-This argument \fBwill be DEPRECATED\fR. Use \fB--http.retry.count\fR instead.
-.RE
-.P
-
-.B \-\-rrdp.retry.interval=\fIUNSIGNED_INTEGER\fR
-.RS 4
-This argument \fBwill be DEPRECATED\fR. Use \fB--http.retry.interval\fR instead.
-.RE
-.P
-
 .B \-\-rsync.enabled=\fItrue\fR|\fIfalse\fR
 .RS 4
 Enables RSYNC requests.