From 0fac774a60bed65dacb5a8764deb32e0a0653570 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 11 Jul 2018 21:22:08 +0200 Subject: [PATCH] Apply expires for hotspot.txt Signed-off-by: Patrick Uiterwijk --- roles/httpd/website/templates/website.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/httpd/website/templates/website.conf b/roles/httpd/website/templates/website.conf index 026b2ffe84..a8517aa17c 100644 --- a/roles/httpd/website/templates/website.conf +++ b/roles/httpd/website/templates/website.conf @@ -16,14 +16,15 @@ ProxyPass "/.well-known/acme-challenge" "http://certgetter01/.well-known/acme-challenge" {% endif %} -{% if site_name == "fedoraproject.org" or site_name == "hotspot-nocache.fedoraproject.org" %} +{% if site_name == "fedoraproject.org" %} + Include "conf.d/fedoraproject./oprg/expires.conf" Alias /static/hotspot.txt /srv/web/fedoraproject.org/static/hotspot.txt {% endif %} {% if sslonly %} RewriteEngine On RewriteCond %{REQUEST_URI} !/.well-known/acme-challenge/.* - {% if site_name == "fedoraproject.org" or site_name == "hotspot-nocache.fedoraproject.org" %} + {% if site_name == "fedoraproject.org" %} RewriteCond %{REQUEST_URI} !/static/hotspot.txt {% endif %} RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]