diff options
| author | Patrick Uiterwijk <puiterwijk@redhat.com> | 2017-01-14 18:40:44 +0000 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2017-01-14 18:40:44 +0000 |
| commit | dd905e591771fdbd0fcf47cefbf8d06aef9463e5 (patch) | |
| tree | f2fb280496526f1c1b9c5a00c369c965ec63a33d | |
| parent | a7d6b0052f5fe988d9d9c4a876d9e46a254be8df (diff) | |
| download | ansible-dd905e591771fdbd0fcf47cefbf8d06aef9463e5.tar.gz ansible-dd905e591771fdbd0fcf47cefbf8d06aef9463e5.tar.xz ansible-dd905e591771fdbd0fcf47cefbf8d06aef9463e5.zip | |
Disable for now, but keep around
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
| -rw-r--r-- | playbooks/include/proxies-reverseproxy.yml | 3 | ||||
| -rw-r--r-- | roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index d642a343a..662c16f75 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -550,13 +550,12 @@ website: registry.fedoraproject.org destname: registry proxyurl: http://localhost:10048 - when: env == "production" - role: httpd/reverseproxy website: registry.fedoraproject.org destname: registry proxyurl: "{{ varnish_url }}" - when: env == "staging" + when: env == "maybe-staging" - role: httpd/reverseproxy website: candidate-registry.fedoraproject.org diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf index ed1e68558..ab464d2d8 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.registry.conf @@ -3,7 +3,7 @@ RequestHeader set X-Scheme https early RequestHeader set X-Forwarded-Proto https early ProxyPreserveHost On -{% if env == "staging" %} +{% if env == "maybe-in-staging" %} RewriteRule ^/v2/([a-zA-Z]*)/blobs/([a-zA-Z]*) https://ourregistry/v2/$1/blobs/$2 [R] {% endif %} |