sync with OpenBSD -current

lib/mesa/docs/ci/bare-metal.rst

@@ -98,7 +98,7 @@ You'll talk to the Cisco for configuration using its USB port, which provides a
 serial terminal at 9600 baud.  You need to enable SNMP control, which we'll do
 using a "mesaci" community name that the gitlab runner can access as its
 authentication (no password) to configure.  To talk to the SNMP on the router,
-you need to put an IP address on the default vlan (vlan 1).
+you need to put an IP address on the default VLAN (VLAN 1).
 
 Setting that up looks something like:
 
@@ -215,16 +215,17 @@ Enable the site and restart nginx:
 
 .. code-block:: console
 
+   sudo rm /etc/nginx/sites-enabled/default
    sudo ln -s /etc/nginx/sites-available/fdo-cache /etc/nginx/sites-enabled/fdo-cache
-   sudo service nginx restart
+   sudo systemctl restart nginx
 
    # First download will hit the internet
-   wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
+   wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo-v2.trace
    # Second download should be cached.
-   wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.trace
+   wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo-v2.trace
 
 Now, set ``download-url`` in your ``traces-*.yml`` entry to something like
-``http://10.42.0.1:8888/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public``
+``http://caching-proxy/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public``
 and you should have cached downloads for traces.  Add it to
 ``FDO_HTTP_CACHE_URI=`` in your ``config.toml`` runner environment lines and you
 can use it for cached artifact downloads instead of going all the way to