Remove workaround for very old ostree
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
parent
f10ce98e0f
commit
acf6f6587b
4 changed files with 0 additions and 69 deletions
|
@ -646,14 +646,6 @@
|
|||
proxyurl: http://localhost:10062
|
||||
keephost: true
|
||||
|
||||
# Nuke after F28 GA.
|
||||
# See roles/httpd/reverseproxy/reversepassproxy.brokenostreekojipkgs.conf
|
||||
- role: httpd/reverseproxy
|
||||
website: brokenostreekojipkgs.fedoraproject.org
|
||||
destname: brokenostreekojipkgs
|
||||
proxyurl: http://localhost:10062
|
||||
keephost: true
|
||||
|
||||
- role: httpd/reverseproxy
|
||||
website: "os{{ env_suffix }}.fedoraproject.org"
|
||||
destname: os
|
||||
|
|
|
@ -554,15 +554,6 @@
|
|||
- kojipkgs02.fedoraproject.org
|
||||
cert_name: "{{wildcard_cert_name}}"
|
||||
|
||||
# Nuke after F28 GA.
|
||||
# This is because older ostrees try http/2, and there's a libcurl bug with h2 that affects it.
|
||||
# This is an http-only website since that avoids the TLS negotiation that negotiates h2, meaning
|
||||
# we force "older" ostrees to http/1.1.
|
||||
- role: httpd/website
|
||||
site_name: brokenostreekojipkgs.fedoraproject.org
|
||||
ssl: false
|
||||
sslonly: false
|
||||
|
||||
- role: httpd/website
|
||||
site_name: apps.fedoraproject.org
|
||||
server_aliases: [apps.stg.fedoraproject.org]
|
||||
|
|
|
@ -6,14 +6,6 @@ RewriteRule ^.*$ https://fedoraproject.org/wiki/Infrastructure/Mirroring#Tools_t
|
|||
RewriteRule ^/$ /pub [R=302,L]
|
||||
|
||||
|
||||
# This is to deal with a broken ostree (actually libcurl) that doesn't work well with ostree
|
||||
# The only remaining image with this bug is F27 Fedora Atomic Workstation
|
||||
# Can be nuked after F28 GA
|
||||
RewriteEngine On
|
||||
RewriteCond %{HTTP_USER_AGENT} ^ostree$
|
||||
RewriteRule ^/ostree/27/(.*)$ http://brokenostreekojipkgs.fedoraproject.org/atomic/repo/$1 [L,R=302]
|
||||
|
||||
|
||||
RedirectMatch 302 ^/pub/fedora/linux/atomic/(.*$) https://kojipkgs.fedoraproject.org/atomic/$1
|
||||
RedirectMatch 302 ^/pub/fedora/linux/atomic https://kojipkgs.fedoraproject.org/atomic/
|
||||
Redirect 302 "/ostree/27" "https://kojipkgs.fedoraproject.org/atomic/repo"
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
{% if rewrite %}
|
||||
RewriteEngine On
|
||||
RewriteRule ^{{remotepath}}$ %{REQUEST_URI}/ [R=301]
|
||||
|
||||
{% endif %}
|
||||
{% if header_scheme %}
|
||||
RequestHeader set X-Forwarded-Scheme https early
|
||||
RequestHeader set X-Scheme https early
|
||||
RequestHeader set X-Forwarded-Proto https early
|
||||
|
||||
{% endif %}
|
||||
{% if header_expect %}
|
||||
RequestHeader unset Expect early
|
||||
|
||||
{% endif %}
|
||||
{% if keephost %}
|
||||
ProxyPreserveHost On
|
||||
{% endif %}
|
||||
|
||||
# This is to deal with a broken ostree (actually libcurl) that doesn't work well with ostree
|
||||
# The only remaining image with this bug is F27 Fedora Atomic Workstation
|
||||
# Can be nuked after F28 GA
|
||||
RewriteEngine On
|
||||
RewriteCond %{HTTP_USER_AGENT} !^ostree$
|
||||
RewriteRule ^(.*)$ https://kojipkgs.fedoraproject.org/$1 [L,R=302]
|
||||
|
||||
|
||||
{% if 'phx2' in inventory_hostname %}
|
||||
|
||||
{% if balancer_name is defined %}
|
||||
<Proxy "balancer://{{balancer_name}}">
|
||||
{% for member in balancer_members %}
|
||||
BalancerMember "{{ member }}/{{remotepath}}"
|
||||
{% endfor %}
|
||||
</Proxy>
|
||||
ProxyPass {{ localpath }} "balancer://{{balancer_name}}"
|
||||
{% else %}
|
||||
ProxyPass {{ localpath }} {{ proxyurl }}{{remotepath}}
|
||||
{% endif %}
|
||||
ProxyPassReverse {{ localpath }} {{ proxyurl }}{{remotepath}}
|
||||
|
||||
{% else %}
|
||||
Redirect 421 /
|
||||
{% endif %}
|
Loading…
Add table
Add a link
Reference in a new issue