Merge branch '0.9.2' into main

source/advanced-ca.rst

@@ -210,7 +210,7 @@ your CA to use this by running:
 
 .. code-block:: text
 
-   krillc repo configure --request </path/to/repo-response.xml>
+   krillc repo configure --response </path/to/repo-response.xml>
 
 Note: Krill will verify that it can successfully connect to the new server and
 perform an :rfc:`8181` 'list' query to see its currently published objects,

source/publication-server.rst

@@ -555,6 +555,6 @@ If you try to remove an unknown publisher, you will get an error:
 Migrate existing Krill CAs
 --------------------------
 
-We have an `open issue <https://github.com/NLnetLabs/krill/issues/480>`_ to allow CAs to migrate
-their content from one publication server to another using a slightly adapted `rfc`:6489 RPKI key roll
-over. We intend to implement this asap and make it available in Krill release 0.9.1.
+If you have an existing Krill CA that is currently publishing under another
+publication server, then you can
+:ref:`migrate it to using a new repository<doc_krill_advanced_ca_migrate_repo>`.

source/testbed.rst

@@ -36,12 +36,12 @@ Here we use nginx, but of course you can use an alternative if you prefer:
 Then we created a configuration file that will proxy all traffic to our
 Krill server (which we will install in a moment):
 
-`/etc/nginx/sites-enabled/krill-testbed-example.do.nlnetlabs.nl`
+`/etc/nginx/sites-enabled/krill.example.org`
 
 .. code-block:: text
 
   server {
-        server_name krill-testbed-example.do.nlnetlabs.nl;
+        server_name krill.example.org;
         client_max_body_size 100M;
 
         location / {
@@ -77,9 +77,6 @@ Install Krill
 
 We use our debian package to install Krill on a test system:
 
-**NOTE**: This will work when Krill 0.9.0 is released! We actually copied a .deb file and
-installed it manually.. Leaving this as the 0.9.0 target documentation:
-
 .. code-block:: text
 
   echo "deb [arch=amd64] https://packages.nlnetlabs.nl/linux/ubuntu/ focal main" >> /etc/apt/sources.list
@@ -96,6 +93,16 @@ Before you start Krill edit `/etc/krill.conf`. Make sure that you
 are okay with the autogenerated random value for `auth_token`, or
 override it with something to your liking.
 
+If you need your testbed to be accessible from other CAs, either
+for publication or to be added as a child under the 'testbed' CA,
+then make sure that you set the following directive to use the
+public URI for your proxy server:
+
+.. code-block:: text
+
+  service_uri = "https://krill.example.org/"
+
+
 Add the following section to your config and change the values to
 your machine's hostname.
 
@@ -114,7 +121,7 @@ your machine's hostname.
   # files as they are written to disk ($data_dir/repo/rrdp/)
   #
   # Set the following value to *your* public proxy hostname and path.
-  rrdp_base_uri = "https://krill-testbed-example.do.nlnetlabs.nl/rrdp/"
+  rrdp_base_uri = "https://krill.example.org/rrdp/"
 
   # RSYNC BASE URI
   #
@@ -123,7 +130,7 @@ your machine's hostname.
   # Make sure that you have an rsyncd running and a module which is
   # configured to expose the rsync repository files. By default these
   # files would be saved to: $data/repo/rsync/current/
-  rsync_jail = "rsync://krill-testbed-example.do.nlnetlabs.nl/repo/"
+  rsync_jail = "rsync://krill.example.org/repo/"
 
   # TA AIA
   #
@@ -136,13 +143,13 @@ your machine's hostname.
   # Manually retrieve the TA certificate from krill and copy it
   # over - it won't change again. You can get it at:
   # https://<yourkrill>/ta/ta.cer
-  ta_aia = "rsync://krill-testbed-example.do.nlnetlabs.nl/ta/ta.cer"
+  ta_aia = "rsync://krill.example.org/ta/ta.cer"
 
   # TA URI
   #
   # Like above, make the TA certificate available over HTTPS and
   # specify the url here so that it may be included in the TAL.
-  ta_uri = "https://krill-testbed-example.do.nlnetlabs.nl/ta/ta.cer"
+  ta_uri = "https://krill.example.org/ta/ta.cer"
 
 Start / Enable krill
 ^^^^^^^^^^^^^^^^^^^^
@@ -180,4 +187,4 @@ mention testing? You get the point.. don't use the TAL, also listed on that page
 anything BUT testing.
 
 To get to the page you need to know the URI:
-https://krill-testbed-example.do.nlnetlabs.nl/index.html#/testbed
+https://krill.example.org/index.html#/testbed