From cc4c46c2e8d914230b9df2f0292eb2e65ca7b9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 2 Apr 2020 14:25:09 +0200 Subject: [PATCH] Do not canonicalize URLs to registry.npmjs.org Kolla Monasca Grafana images are currently not buildable in CI due to: 404 Not Found - GET http://mirror.bhs1.ovh.openstack.org:8080/registry.npmjs/@types%2fcolor-name The url-escaped slash gets mangled by Apache on its way to registry which causes 404. This patch fixes that. Change-Id: I5a3a6551536e2d1e87aa074e0de7619a367b1971 --- modules/openstack_project/templates/mirror.vhost.erb | 2 +- playbooks/roles/mirror/templates/mirror.vhost.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/templates/mirror.vhost.erb b/modules/openstack_project/templates/mirror.vhost.erb index 1912228c52..1e6c384283 100644 --- a/modules/openstack_project/templates/mirror.vhost.erb +++ b/modules/openstack_project/templates/mirror.vhost.erb @@ -220,7 +220,7 @@ LogFormat "%h %l %u %t \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-a # registry.npmjs.org CacheEnable disk "/registry.npmjs" - ProxyPass "/registry.npmjs/" "https://registry.npmjs.org/" ttl=120 keepalive=On retry=0 + ProxyPass "/registry.npmjs/" "https://registry.npmjs.org/" ttl=120 keepalive=On retry=0 nocanon ProxyPassReverse "/registry.npmjs/" "https://registry.npmjs.org/" # api.rubygems.org diff --git a/playbooks/roles/mirror/templates/mirror.vhost.j2 b/playbooks/roles/mirror/templates/mirror.vhost.j2 index 6429032c79..5fdcaf1fac 100644 --- a/playbooks/roles/mirror/templates/mirror.vhost.j2 +++ b/playbooks/roles/mirror/templates/mirror.vhost.j2 @@ -232,7 +232,7 @@ ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \ # registry.npmjs.org CacheEnable disk "/registry.npmjs" - ProxyPass "/registry.npmjs/" "https://registry.npmjs.org/" ttl=120 keepalive=On retry=0 + ProxyPass "/registry.npmjs/" "https://registry.npmjs.org/" ttl=120 keepalive=On retry=0 nocanon ProxyPassReverse "/registry.npmjs/" "https://registry.npmjs.org/" # api.rubygems.org