Merge branch 'master' of /git/ansible

roles/httpd/reverseproxy/templates/reversepassproxy.registry-fedora.conf

@@ -2,7 +2,7 @@ RewriteEngine on
 
 RewriteRule ^/v2/latest/(.*) /v2/f27/$1 [R,L]
 
-{% if env == "staging" %}
+{% if env == "staging-new" %}
 RewriteRule ^/v2/(.*) /v2/fedora/$1
 {% endif %}
 
@@ -15,7 +15,7 @@ RewriteRule ^/signatures/(.*) /srv/web/registry-signatures/$1 [L]
 {% include './reversepassproxy.registry-generic.conf' %}
 
 # Write access to docker-deployer only
-{% if env == "staging" %}
+{% if env == "staging-new" %}
   <Location /v2/fedora>
     <LimitExcept GET HEAD>
       Require user docker-registry-internal-stg