docs/ci: default to port 80 for the caching proxy

Also use `caching-proxy` as a name which is automatically
generated from `NFS_SERVER_IP`.

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24445>

diff --git a/docs/ci/bare-metal.rst b/docs/ci/bare-metal.rst
index 1240591..28ff51f 100644 (file)
--- a/docs/ci/bare-metal.rst
+++ b/docs/ci/bare-metal.rst
@@ -224,7 +224,7 @@ Enable the site and restart nginx:
    wget http://localhost/cache/?uri=https://s3.freedesktop.org/mesa-tracie-public/itoral-gl-terrain-demo/demo.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

diff --git a/docs/ci/fdo-cache b/docs/ci/fdo-cache
index 922cd76..a2d8b9d 100644 (file)
--- a/docs/ci/fdo-cache
+++ b/docs/ci/fdo-cache
@@ -1,9 +1,9 @@
 proxy_cache_path /var/cache/nginx/ levels=1:2 keys_zone=my_cache:10m max_size=24g inactive=48h use_temp_path=off;
 
 server {
-       listen 10.42.0.1:8888 default_server;
-       listen 127.0.0.1:8888 default_server;
-       listen [::]:8888 default_server;
+       listen 10.42.0.1:80 default_server;
+       listen 127.0.0.1:80 default_server;
+       listen [::]:80 default_server;
        resolver 8.8.8.8;
 
        root /var/www/html;