From 1a0590e5fd2d4808e676d388eec037fa0eca6d2d Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 24 Jan 2018 21:49:51 +0100 Subject: [PATCH] Add multitenancy to staging registry Signed-off-by: Patrick Uiterwijk --- .../templates/reversepassproxy.registry.conf | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf index 4b65819173..c9d501657c 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf @@ -6,7 +6,16 @@ ProxyPreserveHost On RewriteEngine on RewriteRule ^/signatures/(.*) /srv/web/registry-signatures/$1 [L] -RewriteRule ^/v2/latest/(.*) /v2/f27/$1 [R,L] +{% if env == "staging" %} +RewriteCond %{HTTP_HOST} "registry{{env_suffix}}.fedoraproject.org" +RewriteRule ^/v2/(.*) /v2/fedora/$1 + +RewriteCond %{HTTP_HOST} "registry{{env_suffix}}.centos.org" +RewriteRule ^/v2/(.*) /v2/centos/$1 +{% endif %} + + +RewriteRule ^/v2/fedora/latest/(.*) /v2/fedora/f27/$1 [R,L] {% if env == "production" %} RewriteCond %{HTTP:VIA} !cdn77 @@ -48,8 +57,25 @@ SSLOptions +FakeBasicAuth # Write access to docker-deployer only - - Require valid-user - + {% if env == "staging" %} + + + Require user docker-registry-internal-stg + + + + + + Require user docker-registry-centos-stg + + + + Require all denied + + {% else %} + + require valid-user + + {% endif %}