From 9178b3fefa308e8a105e8532b29a611635a6bfba Mon Sep 17 00:00:00 2001 From: Dave O'Connor Date: Mon, 23 Jun 2025 16:57:02 -0700 Subject: [PATCH] feat: updated nginx redirects with generated ones from docs (#1813) --- .dockerignore | 3 ++ kube/boost/templates/configmap-nginx.yaml | 36 +++++++++++++++++++++++ requirements-dev.in | 2 +- requirements-dev.txt | 2 +- 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index cae85ad4..e0a679c0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -149,3 +149,6 @@ static_deploy Makefile README.md venv/ + +# used for the nginx redirect generation +tarballs/ diff --git a/kube/boost/templates/configmap-nginx.yaml b/kube/boost/templates/configmap-nginx.yaml index 3d799f47..3b821051 100644 --- a/kube/boost/templates/configmap-nginx.yaml +++ b/kube/boost/templates/configmap-nginx.yaml @@ -136,5 +136,41 @@ data: location = /build/ { return 301 /tools/build/; } location = /more/lib_guide.htm { return 301 /doc/contributor-guide/index.html; } + # the following block of locations are from the nginx redirect configuration and + # should be replaced with the newly generated block as a whole (see docs/nginx_redirects.md) + + location = /doc/libs/1.33.0/libs/spirit/example { return 301 https://github.com/boostorg/spirit/tree/boost-1.33.0/example; } + location = /doc/libs/1.69.0/libs/beast/example/cppcon2018 { return 301 https://github.com/boostorg/beast/tree/boost-1.69.0/example/cppcon2018; } + location ~ ^/doc/libs/([^/]+)/boost/archive/detail$ { return 301 https://github.com/boostorg/serialization/tree/boost-$1/include/boost/archive/detail; } + location ~ ^/doc/libs/([^/]+)/boost/archive/impl$ { return 301 https://github.com/boostorg/serialization/tree/boost-$1/include/boost/archive/impl; } + location ~ ^/doc/libs/([^/]+)/boost/archive/iterators$ { return 301 https://github.com/boostorg/serialization/tree/boost-$1/include/boost/archive/iterators; } + location ~ ^/doc/libs/([^/]+)/boost/compatibility/cpp_c_headers$ { return 301 https://github.com/boostorg/compatibility/tree/boost-$1/include/boost/compatibility/cpp_c_headers; } + location ~ ^/doc/libs/([^/]+)/libs/beast/example$ { return 301 https://github.com/boostorg/beast/tree/boost-$1/example; } + location ~ ^/doc/libs/([^/]+)/libs/beast/example/websocket/server/chat-multi$ { return 301 https://github.com/boostorg/beast/tree/boost-$1/example/websocket/server/chat-multi; } + location ~ ^/doc/libs/([^/]+)/libs/bimap/example$ { return 301 https://github.com/boostorg/bimap/tree/boost-$1/example; } + location ~ ^/doc/libs/([^/]+)/libs/filesystem/doc/src$ { return 301 https://github.com/boostorg/filesystem/tree/boost-$1/doc/src; } + location ~ ^/doc/libs/([^/]+)/libs/filesystem/example$ { return 301 https://github.com/boostorg/filesystem/tree/boost-$1/example; } + location ~ ^/doc/libs/([^/]+)/libs/filesystem/src$ { return 301 https://github.com/boostorg/filesystem/tree/boost-$1/src; } + location ~ ^/doc/libs/([^/]+)/libs/filesystem/v2/example$ { return 301 https://github.com/boostorg/filesystem/tree/boost-$1/v2/example; } + location ~ ^/doc/libs/([^/]+)/libs/filesystem/v2/src$ { return 301 https://github.com/boostorg/filesystem/tree/boost-$1/v2/src; } + location ~ ^/doc/libs/([^/]+)/libs/filesystem/v3/src$ { return 301 https://github.com/boostorg/filesystem/tree/boost-$1/v3/src; } + location ~ ^/doc/libs/([^/]+)/libs/iostreams/build$ { return 301 https://github.com/boostorg/iostreams/tree/boost-$1/build; } + location ~ ^/doc/libs/([^/]+)/libs/python/build/VisualStudio$ { return 301 https://github.com/boostorg/python/tree/boost-$1/build/VisualStudio; } + location ~ ^/doc/libs/([^/]+)/libs/python/example$ { return 301 https://github.com/boostorg/python/tree/boost-$1/example; } + location ~ ^/doc/libs/([^/]+)/libs/python/test$ { return 301 https://github.com/boostorg/python/tree/boost-$1/test; } + location ~ ^/doc/libs/([^/]+)/libs/regex/test/captures$ { return 301 https://github.com/boostorg/regex/tree/boost-$1/test/captures; } + location ~ ^/doc/libs/([^/]+)/libs/regex/test/concepts$ { return 301 https://github.com/boostorg/regex/tree/boost-$1/test/concepts; } + location ~ ^/doc/libs/([^/]+)/libs/regex/test/pathology$ { return 301 https://github.com/boostorg/regex/tree/boost-$1/test/pathology; } + location ~ ^/doc/libs/([^/]+)/libs/regex/test/regress$ { return 301 https://github.com/boostorg/regex/tree/boost-$1/test/regress; } + location ~ ^/doc/libs/([^/]+)/libs/serialization/src$ { return 301 https://github.com/boostorg/serialization/tree/boost-$1/src; } + location ~ ^/doc/libs/([^/]+)/libs/sort/example$ { return 301 https://github.com/boostorg/sort/tree/boost-$1/example; } + location ~ ^/doc/libs/([^/]+)/libs/spirit/example/qi/mini_xml_samples$ { return 301 https://github.com/boostorg/spirit/tree/boost-$1/example/qi/mini_xml_samples; } + location ~ ^/doc/libs/([^/]+)/libs/spirit/example/support/utree$ { return 301 https://github.com/boostorg/spirit/tree/boost-$1/example/support/utree; } + location ~ ^/doc/libs/([^/]+)/libs/spirit/example/x3/rexpr/rexpr_full$ { return 301 https://github.com/boostorg/spirit/tree/boost-$1/example/x3/rexpr/rexpr_full; } + location ~ ^/doc/libs/([^/]+)/tools/boostbook$ { return 301 https://github.com/boostorg/boostbook/tree/boost-$1; } + location ~ ^/doc/libs/([^/]+)/tools/build/v2/example/customization$ { return 301 https://github.com/boostorg/build/tree/boost-$1/v2/example/customization; } + + # block end + include /etc/nginx/mime.types; } diff --git a/requirements-dev.in b/requirements-dev.in index 0082442a..994317dd 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,3 +1,3 @@ -c requirements.txt django-debug-toolbar -pydevd-pycharm==243.26053.29 # pinned to appropriate version for current pycharm +pydevd-pycharm==233.13135.95 # pinned to appropriate version for current pycharm diff --git a/requirements-dev.txt b/requirements-dev.txt index 7d058647..c568a036 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -10,7 +10,7 @@ django==4.2.16 # django-debug-toolbar django-debug-toolbar==4.4.6 # via -r ./requirements-dev.in -pydevd-pycharm==243.26053.29 +pydevd-pycharm==233.13135.95 # via -r ./requirements-dev.in sqlparse==0.5.1 # via