From 95bb242a2241e9cbd2e35b00358de66b216e2e1d Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sat, 10 Oct 2020 23:01:43 +0200 Subject: arch-mirror.home.eckner.net.conf: archlinuxewe has new layout --- arch-mirror.home.eckner.net.conf | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'arch-mirror.home.eckner.net.conf') diff --git a/arch-mirror.home.eckner.net.conf b/arch-mirror.home.eckner.net.conf index 56ee3da..76c0fa6 100644 --- a/arch-mirror.home.eckner.net.conf +++ b/arch-mirror.home.eckner.net.conf @@ -24,15 +24,15 @@ server { autoindex on; # Requests for package db, signature files and files db should redirect upstream without caching - location ~ /archlinuxewe/os/[^/]+/[^/]+\.(db|sig|files)$ { - proxy_pass http://mirrorsewe$request_uri; + location ~ /archlinuxewe/os/([^/]+)/([^/]+\.(db|sig|files))$ { + proxy_pass http://mirrorsewe/os/$1/$2; } location ~ /releng/os/x86_64/([^/]+\.(db|sig|files))$ { proxy_pass http://mirrors32/x86_64/releng/$1; } location ~ ^/([^/]+)/archlinuxewe/([^/]+\.(db|sig|files))$ { - proxy_pass http://mirrorsewe/archlinuxewe/os/$1/$2; + proxy_pass http://mirrorsewe/os/$1/$2; } location ~ /x86_64/[^/]+\.(db|sig|files)$ { proxy_pass http://mirrors$request_uri; @@ -46,11 +46,11 @@ server { # Requests for actual packages should be served directly from cache if available. # If not available, retrieve and save the package from an upstream mirror. - location ~ /archlinuxewe/os/[^/]+/[^/]+\.tar\.(xz|zst)$ { + location ~ /archlinuxewe/os/([^/]+)/([^/]+\.tar\.(xz|zst))$ { try_files $uri @caches @pkg_mirrorewe; } location ~ ^/([^/]+)/archlinuxewe/([^/]+\.tar\.(xz|zst))$ { - try_files /archlinuxewe/os/$1/$2 @caches_reordered @pkg_mirrorewe_reordered; + try_files /archlinuxewe/os/$1/$2 @caches_reordered @pkg_mirrorewe; } location ~ ^/(releng)/os/([^/]+)/([^/]+\.tar\.(xz|zst))$ { try_files $uri @caches @pkg_mirror32_reordered; @@ -116,14 +116,7 @@ server { proxy_redirect off; proxy_store_access user:rw group:rw all:r; proxy_next_upstream error timeout http_404; - proxy_pass http://mirrorsewe$request_uri; - } - location @pkg_mirrorewe_reordered { - proxy_store on; - proxy_redirect off; - proxy_store_access user:rw group:rw all:r; - proxy_next_upstream error timeout http_404; - proxy_pass http://mirrorsewe/archlinuxewe/os/$1/$2; + proxy_pass http://mirrorsewe/os/$1/$2; } } -- cgit v1.2.3-54-g00ecf