opendev/system-config
Code Issues Proposed changes

Merge "Corrected mod_rewrite in pypi mirror"

Browse Source
This commit is contained in:
Jenkins 2016-01-25 16:08:02 +00:00 committed by Gerrit Code Review
commit 3d68f4717d
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/openstack_project/templates/mirror.vhost.erb
View File

@ -22,16 +22,20 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
</IfVersion>
</Directory>
# Pypi URL's are:
# /pypi/simple/a/a/a-etc.whl
# /pypi/simple/a/abcd/abcd-etc.whl
# /pypi/simple/a/abcde/abcde-etc.whl
RewriteEngine On
RewriteRule ^/pypi/simple/([^/])([^/]*)$ /pypi/simple/$1/$1$2 [L]
RewriteRule ^/pypi/simple/([^/])([^/]*)/(.*)$ /pypi/simple/$1/$1$2/$3 [L]
# Pypi's bandersnatch URL's are:
# /pypi/simple/index.html
# /pypi/simple/a/a/(index.html)?
# /pypi/simple/a/a/a-etc.whl
# /pypi/simple/a/abcd/(index.html)?
# /pypi/simple/a/abcd/abcd-etc.whl
RewriteCond %{REQUEST_URI} ^/pypi/simple/([^/])([^/]*)
RewriteCond %{DOCUMENT_ROOT}/pypi/simple/$1/$1$2 -d
RewriteRule ^/pypi/simple/([^/])([^/]*)(/.*)?$ /pypi/simple/$1/$1$2$3 [L]
ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
LogLevel warn
CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
ServerSignature Off
</VirtualHost>
</VirtualHost>