@@ -21,18 +21,13 @@ server {
2121 error_log /var/log/nginx/buildbot-master.error.log;
2222 access_log /var/log/nginx/buildbot-master.access.log main;
2323
24- rewrite ^/$ https://www.python.org/dev/buildbot/ redirect;
25- rewrite ^/3.7(/?)$ /all/#/grid?branch=3.7 redirect;
26- rewrite ^/3.8(/?)$ /all/#/grid?branch=3.8 redirect;
27- rewrite ^/3.9(/?)$ /all/#/grid?branch=3.9 redirect;
28- rewrite ^/3.10(/?)$ /all/#/grid?branch=3.10 redirect;
29- rewrite ^/3.x(/?)$ /all/#/grid?branch=main redirect;
30- rewrite ^/3.7.stable(/?)$ /all/#/grid?branch=3.7&tag=stable redirect;
31- rewrite ^/3.8.stable(/?)$ /all/#/grid?branch=3.8&tag=stable redirect;
32- rewrite ^/3.9.stable(/?)$ /all/#/grid?branch=3.9&tag=stable redirect;
33- rewrite ^/3.10.stable(/?)$ /all/#/grid?branch=3.10&tag=stable redirect;
34- rewrite ^/3.x.stable(/?)$ /all/#/grid?branch=main&tag=stable redirect;
35- rewrite ^/stable(/?)$ /all/#/grid?tag=stable redirect;
24+ rewrite ^/3.(\d+)(/?)$ /#/grid?branch=3.$1 redirect;
25+ rewrite ^/3.x(/?)$ /#/grid?branch=main redirect;
26+ rewrite ^/3.(\d+).stable(/?)$ /#/grid?branch=3.$1&tag=stable redirect;
27+ rewrite ^/3.x.stable(/?)$ /#/grid?branch=main&tag=stable redirect;
28+ rewrite ^/stable(/?)$ /#/grid?tag=stable redirect;
29+
30+ rewrite ^/all/(.*)$ /$1 redirect;
3631
3732 location @backend {
3833 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -42,18 +37,17 @@ server {
4237 proxy_pass http://localhost:9010;
4338 }
4439
45- location / {
40+ location /robots.txt {
4641 autoindex on;
4742 root /data/www/buildbot/;
4843 }
4944
50- location /all/ {
45+ location / {
5146 autoindex on;
52- root /data/www/buildbot/;
5347 try_files $uri $uri/ @backend;
5448 }
5549
56- location /all/ ws {
50+ location /ws {
5751 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5852 proxy_set_header Host $http_host;
5953 proxy_redirect off;
0 commit comments