Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Redirect fp.o to https://fp.o first, then to getfedora.org but not for hotspot.txt

Browse source 
This reverts commit 80ac144f78.
This commit is contained in:
Patrick Uiterwijk 2018-06-28 11:37:06 +02:00
parent 80ac144f78
commit 424d7c10bb
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/include/proxies-websites.yml
View file

@ -48,6 +48,7 @@
- role: httpd/website - role: httpd/website
site_name: fedoraproject.org site_name: fedoraproject.org
sslonly: true
cert_name: "{{wildcard_cert_name}}" cert_name: "{{wildcard_cert_name}}"
server_aliases: server_aliases:
- stg.fedoraproject.org - stg.fedoraproject.org

6
roles/httpd/website/templates/website.conf
View file

@ -14,10 +14,14 @@
ProxyPass "/.well-known/acme-challenge" "http://certgetter01/.well-known/acme-challenge" ProxyPass "/.well-known/acme-challenge" "http://certgetter01/.well-known/acme-challenge"
{% endif %} {% endif %}
{% if site_name == "fedoraproject.org" %}
Alias /static/hotspot.txt /srv/web/fedoraproject.org/static/hotspot.txt
{% endif %}
{% if sslonly %} {% if sslonly %}
RewriteEngine On RewriteEngine On
RewriteCond %{HTTPS} off
RewriteCond %{REQUEST_URI} !/.well-known/acme-challenge/.* RewriteCond %{REQUEST_URI} !/.well-known/acme-challenge/.*
RewriteCond %{REQUEST_URI} !/static/hotspot.txt
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE] RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
{% else %} {% else %}
Include "conf.d/{{ site_name }}/*.conf" Include "conf.d/{{ site_name }}/*.conf"