From 10b0305fe275f4225eb635f0e71128ed5cd22950 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 26 May 2016 13:44:49 +1000 Subject: [PATCH] Revert "Work around bandersnatch not supporting pep503" This reverts the combined commits c640ca2d975a0b9e423ad76bf0ce2bc4397d2e98 and ce7d4b37484ad1cc5fae1ba034b68cbbf1c7cfdc. The newly released bandersnatch 1.11 fixes these layout issues (see I2b5822a7383b8f2f49958c8268453333dabe52cc) Depends-On: I6a1f213a3127f57b41b4ec7e3f128b1bbde2ae37 Change-Id: Ia06cb56b510e2ac5fa232323f97db1b1b18a4519 --- .../templates/mirror.vhost.erb | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/modules/openstack_project/templates/mirror.vhost.erb b/modules/openstack_project/templates/mirror.vhost.erb index 9cbed20d33..9e7452e21f 100644 --- a/modules/openstack_project/templates/mirror.vhost.erb +++ b/modules/openstack_project/templates/mirror.vhost.erb @@ -51,26 +51,6 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> RewriteCond %{DOCUMENT_ROOT}/npm/$1/$1$2 -d RewriteRule ^/npm/([^/])([^/]*)(/.*)?$ /npm/$1/$1$2$3 [L] - # TODO(jhesketh): Remove this after bandersnatch implements pep503 - # https://bitbucket.org/pypa/bandersnatch/pull-requests/20/fully-implement-pep-503-normalization/diff - - # Special cases for openstack.nose_plugin & backports.* - RewriteRule ^(.*)/openstack-nose-plugin(.*)$ $1/openstack.nose_plugin$2 - RewriteRule ^(.*)/backports-(.*)$ $1/backports.$2 - - RewriteCond %{REQUEST_URI} ^/pypi/simple/([^/])([^/]*) - RewriteCond %{DOCUMENT_ROOT}/pypi/simple/$1/$1$2 -d - RewriteRule ^/pypi/simple/([^/])([^/]*)(/.*)?$ /pypi/simple/$1/$1$2$3 [L] - - # Try again but replacing -'s with .'s - RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-f - RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_URI} !-d - RewriteRule (.*)-(.*) $1.$2 [N] - - RewriteCond %{REQUEST_URI} ^/pypi/simple/([^/])([^/]*) - RewriteCond %{DOCUMENT_ROOT}/pypi/simple/$1/$1$2 -d - RewriteRule ^/pypi/simple/([^/])([^/]*)(/.*)?$ /pypi/simple/$1/$1$2$3 [L] - \/npm\/[^/]+\/.*"> DirectoryIndex index.json AddOutputFilterByType SUBSTITUTE application/json