Skip to content

Commit f5fbb30

Browse files
committed
First pass of typo and formatting fixes
1 parent a886364 commit f5fbb30

9 files changed

+37
-65
lines changed

doc/manual/source/architecture.rst

+3-8
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ called ``archived`` under the relevant data directory, i.e.
4747
``data_dir/pubd/0/archived`` if you are using the Krill Publication Server and
4848
``data_dir/cas/<your-ca-name>/archived`` for each of your CAs.
4949

50-
You can set up a cronjob to delete these events once and for all, but we
50+
You can set up a cron job to delete these events once and for all, but we
5151
recommend that you save them in long term storage if you can. The reason is that
5252
if (and only if) you have this data, you will be able to rebuild the complete
5353
Krill state based on its *audit* log of events, and irrevocably prove that no
@@ -60,10 +60,7 @@ Saving State Changes
6060

6161
You can skip this section if you're not interested in the gory details. However,
6262
understanding this section will help to explain how backup and restore works in
63-
Krill, and why a standby fail-over node can be used, but Krill's locking and
64-
storage mechanism needs to be changed in order to make
65-
`multiple active nodes <https://github.com/NLnetLabs/krill/issues/20>`_
66-
work.
63+
Krill, and how a standby fail-over node can be used.
6764

6865
State changes in Krill are tracked using *events*. Krill CA(s) and Publication
6966
Servers are versioned. They can only be changed by applying an *event* for a
@@ -76,9 +73,7 @@ so-called *aggregates*.
7673
Events are not applied directly. Rather, users of Krill and background jobs will
7774
send their intent to make a change through the API, which then translates
7875
this into a so-called *command*. Krill will then *lock* the target aggregate
79-
and send the command to it. This locking mechanism is not aware of any
80-
clustering, and it's a primary reason why Krill cannot run as an active-active
81-
cluster yet.
76+
and send the command to it.
8277

8378
Upon receiving a command the aggregate (your CA etc.) will do some work. In some
8479
cases a command can have a side-effect. For example it may instruct your CA to

doc/manual/source/building-from-source.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ this should be as simple as running:
8585
Building with Cargo
8686
"""""""""""""""""""
8787

88-
Rust uses its own build tool, called ```cargo```.
88+
Rust uses its own build tool, called ``cargo``.
8989

9090
https://github.com/NLnetLabs/krill
9191

@@ -94,7 +94,7 @@ You can clone the
9494
a release and then use ```cargo build --release --locked``` to build the code.
9595

9696
An easier way to build a specific release with the need to clone the
97-
repository first is to leave it to ```cargo```. Krill releases and tags
97+
repository first is to leave it to ``cargo``. Krill releases and tags
9898
are listed `here <https://github.com/NLnetLabs/krill/releases>`_
9999

100100
You can install a tagged github release using cargo by saying:

doc/manual/source/ca-keyroll.rst

+2-7
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@ the content of all 'objects', like ROAs and possibly certificates issued to chil
99
is preserved in re-issued objects under the new key, without noticeable interruptions
1010
to RPKI validators.
1111

12-
Before we can dive in to key rollovers we need to take a step back and talk a bit
13-
about RPKI CA certificates and keys.
14-
1512
For most users their CA will have only one parent CA and only one key and CA certificate
16-
under that parent. But, krill supports having multiple so-called "Resource Classes" under
13+
under that parent. But, Krill supports having multiple so-called "Resource Classes" under
1714
a parent. The term Resource Class stems from :rfc:`6492` - essentially you can think of
18-
these as a way to to group a set of resources that can appear on a single certificate.
15+
these as a way to group a set of resources that can appear on a single certificate.
1916
This construct is needed because RPKI CA certificates can have only one signing parent CA
2017
certificate. So, if your parent received resources on different certificate (presumably from
2118
different sources), then they cannot sign a single certificate to you with all those resources.
@@ -43,14 +40,12 @@ First you need to initialise a new key to start the process:
4340
4441
krillc keyroll init
4542
46-
4743
Then, you should wait 24 hours and before activating the new key and retiring the old:
4844

4945
.. code-block:: text
5046
5147
krillc keyroll activate
5248
53-
5449
Caveats:
5550

5651
- The ``init`` command will have no effect if your CA is in the middle of a rollover

doc/manual/source/ca-migrate-repo.rst

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ new key that will use the new server, and the base URIs it got from that server.
1717
Then you need to complete the key rollover (activate the new key), to remove
1818
the old key and the dependency on the old server.
1919

20-
There is no web UI support for this (yet), but you can do this using the CLI.
21-
2220
First, get the so-called :rfc:`8183` Publisher Request XML for your CA:
2321

2422
.. code-block:: text

doc/manual/source/cli.rst

+6-9
Original file line numberDiff line numberDiff line change
@@ -130,23 +130,20 @@ Other operations:
130130
:ref:`children<cmd_krillc_children>` Manage children for a CA
131131
:ref:`keyroll<cmd_krillc_keyroll>` Perform a manual key rollover for a CA
132132
133-
134-
135133
.. _cmd_krillc_config:
136134

137135
krillc config
138136
-------------
139137

140-
This subcommand is implemented on the CLI only and is intended to help generate a configuration
141-
file which can be used for your Krill server.
138+
This subcommand is implemented on the CLI only and is intended to help
139+
generate a configuration file which can be used for your Krill server.
142140

143-
We currently support two subcommands for this: `krillc config simple` and `krillc config user`.
144-
The first can be used to generate general server configuration. The second can be used to generate
145-
user (`id`) entries to use if you want to have multiple local users access the Krill UI by their own
141+
We currently support two subcommands for this: ``krillc config simple`` and
142+
``krillc config user``. The first can be used to generate general server
143+
configuration. The second can be used to generate user (``id``) entries to
144+
use if you want to have multiple local users access the Krill UI by their own
146145
name and password.
147146

148-
....
149-
150147
.. _cmd_krillc_health:
151148

152149
krillc health

doc/manual/source/hsm.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Krill uses what it calls a "signer" to create and manage keys and to
4141
sign data with them. For the most part the Krill CA code is unaware of
4242
which signer implementation is associated with a key. For long-lived
4343
key-pairs such as the keys used in RPKI CA certificates (the resource
44-
certificate signed by the parent) and the ID certifcate used in the
44+
certificate signed by the parent) and the ID certificate used in the
4545
:RFC:`6492` (provisioning) and :RFC:`8181` (publication) protocols, it
4646
will only keep track of the public key identifier.
4747

@@ -218,7 +218,7 @@ file, one for each signer that you wish to define.
218218
All signers must have a ``type`` and a ``name`` and properties specific
219219
to the type of signer.
220220

221-
The default configuration is equivalent to addding the following in
221+
The default configuration is equivalent to adding the following in
222222
``krill.conf``:
223223

224224
.. code-block::

doc/manual/source/publication-server.rst

+11-16
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ Proxy for Remote Publishers
100100
---------------------------
101101

102102
Krill runs the RFC8181 Publication Server. Remote publishers, CAs which use your
103-
Publication Server, will need to connect to this under the `/rfc8181` path under
104-
the `service_uri` that you specified in your server.
103+
Publication Server, will need to connect to this under the ``/rfc8181`` path under
104+
the ``service_uri`` that you specified in your server.
105105

106106
Make sure that you set up a proxy server such as NGINX, Apache, etc. which uses
107-
a valid HTTPS certificate, and which proxies `/rfc8181` to Krill.
107+
a valid HTTPS certificate, and which proxies ``/rfc8181`` to Krill.
108108

109109
Note that you should not add any additional authentication mechanisms to this
110110
location. RFC 8181 uses cryptographically signed messages sent over HTTP and is
@@ -125,14 +125,14 @@ proxy access to the path '/api' to Krill.
125125
Example NGINX configuration
126126
---------------------------
127127

128-
As introduced above krill has two paths that contain the endpoints. `/api` for the
129-
krill API that you may want to restrict. `/rfc8181` is used for publication. A
130-
configuration that allows `192.0.2.0/24` and the IPv6 documentation prefix access to
128+
As introduced above, Krill has two paths that contain the endpoints: ``/api`` for the
129+
Krill API that you may want to restrict and ``/rfc8181`` is used for publication. A
130+
configuration that allows ``192.0.2.0/24`` and the IPv6 documentation prefix access to
131131
the API, and all clients to publish is below.
132132

133133
It is recommended to publish the RRDP content on a different hostname.
134134

135-
`/etc/nginx/sites-enabled/krill.example.org`
135+
``/etc/nginx/sites-enabled/krill.example.org``
136136

137137
.. code-block:: text
138138
@@ -201,8 +201,6 @@ Configure the Repository
201201
their content. We use the term **Repository Server** to describe a server
202202
which makes this content available to RPKI Validators.
203203

204-
205-
206204
Synchronise Repository Data
207205
"""""""""""""""""""""""""""
208206

@@ -237,8 +235,8 @@ sets of data to disk for use by your Repository Servers.
237235
Another option is to use some kind of shared file system (NFS, clustered filesystem, network
238236
storage) where the **Krill Publication Server** can write, and your **Repository Servers** can read.
239237

240-
If you go down this path, then make sure that the entire `$DATA_DIR/repo` is on a share.
241-
In particular: don't use a mount point at `$DATA_DIR/repo/rsync/current` as this directory
238+
If you go down this path, then make sure that the entire :file:`$DATA_DIR/repo` is on a share.
239+
In particular: don't use a mount point at :file:`$DATA_DIR/repo/rsync/current` as this directory
242240
is recreated by Krill whenever it publishes new data.
243241

244242
There can be issues with this approach with regards to availability and atomicity of updates
@@ -248,8 +246,6 @@ or deltas are available. It will also write new files to temporary files and the
248246
to avoid that partially written files are shown to users. However, dependent on the implementation
249247
details of the shared data these strategies may not work.
250248

251-
252-
253249
Rsync
254250
"""""
255251

@@ -359,13 +355,12 @@ on their certificates.
359355
If you should end up in this situation, then you could set up a new Publication
360356
Server instead, and then migrate your existing CAs to that server, and then
361357
remove your current server altogether. Alternatively, you can remove all
362-
publishers from your server first, then clear and re-inialise it, and then
358+
publishers from your server first, then clear and re-initialise it, and then
363359
add your CAs again and migrate them to this newly initialised version.
364360

365361
In short: it is best to avoid this and ensure that your are happy with the
366362
URIs used before adding publishers.
367363

368-
369364
Repository Stats
370365
""""""""""""""""
371366

@@ -463,7 +458,7 @@ from the UI, as described :ref:`here<doc_krill_using_ui_repository_setup>`.
463458
The XML will include a so-called 'handle' - essentially the name that the CA likes
464459
to use for itself. This handle needs to be unique on the server side - we can't
465460
have all CAs calling themselves `mr-black`. For this reason the CLI offers an
466-
optional argument ``--publisher`` that allows overriding the handle in the reqeust
461+
optional argument ``--publisher`` that allows overriding the handle in the request
467462
with a locally unique value - e.g. a UUID.
468463

469464
After adding a publisher the server will respond with the unique :rfc:`8183` Repository

doc/manual/source/testbed.rst

+4-14
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Restart nginx and we have our proxy server set up:
5959
systemctl restart nginx
6060
6161
62-
Set up Letsencrypt
63-
^^^^^^^^^^^^^^^^^^
62+
Set up Let's Encrypt
63+
^^^^^^^^^^^^^^^^^^^^
6464

6565
This is as easy as installing the `certbot` and running its interactive
6666
script to setup integration with NGINX:
@@ -75,16 +75,8 @@ script to setup integration with NGINX:
7575
Install Krill
7676
^^^^^^^^^^^^^
7777

78-
We use our debian package to install Krill on a test system:
79-
80-
.. code-block:: text
81-
82-
echo "deb [arch=amd64] https://packages.nlnetlabs.nl/linux/ubuntu/ focal main" >> /etc/apt/sources.list
83-
apt-get update
84-
apt-get install krill
85-
86-
You can read more about Krill installation options `here <https://rpki.readthedocs.io/en/latest/krill/install-and-run.html#installing-with-debian-and-ubuntu-packages>`_.
87-
78+
Install Krill according to the :ref:`installation instructions
79+
<doc_krill_install_and_run>` for Debian, Ubuntu or Red Hat Enterprise Linux.
8880

8981
Configure Testbed
9082
^^^^^^^^^^^^^^^^^
@@ -102,11 +94,9 @@ public URI for your proxy server:
10294
10395
service_uri = "https://krill.example.org/"
10496
105-
10697
Add the following section to your config and change the values to
10798
your machine's hostname.
10899

109-
110100
.. code-block:: text
111101
112102
[testbed]

doc/manual/source/trust-anchor.rst

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
Krill as a Trust Anchor
44
=======================
55

6-
Krill can be set up to operate an RPKI Trust Anchor (TA). An RPKI TA
7-
serves as an `entry point for RPKI validators <https://rpki.readthedocs.io/en/latest/rpki/using-rpki-data.html#connecting-to-the-trust-anchor>`_.
8-
There are currently `five globally used TAs <https://rpki.readthedocs.io/en/latest/rpki/introduction.html#mapping-the-resource-allocation-hierarchy-into-the-rpki>`_
9-
operated by the five RIRs, where each RIR is responsible for IPv4, IPv6
10-
and AS number resources that are allocated to them by IANA.
6+
Krill can be set up to operate an RPKI Trust Anchor (TA). An RPKI TA serves
7+
as an `entry point for RPKI validators
8+
<https://rpki.readthedocs.io/en/latest/rpki/using-rpki-data.html#connecting-to-the-trust-anchor>`_.
9+
There are currently `five globally used TAs
10+
<https://rpki.readthedocs.io/en/latest/rpki/introduction.html#mapping-the-resource-allocation-hierarchy-into-the-rpki>`_
11+
operated by the five RIRs, where each RIR is responsible for IPv4, IPv6 and
12+
AS number resources that are allocated to them by IANA.
1113

1214
If you are not an RIR, then you will not need to run your own RPKI TA for
1315
normal RPKI operations. Instead, you would operate one or more RPKI CAs that get

0 commit comments

Comments
 (0)