From 6d8240bd5b5e43b7fd81305f2edf96fc1b7f91ef Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 11 Jul 2018 19:08:56 +0000 Subject: [PATCH] This is python-like, not C-like Signed-off-by: Patrick Uiterwijk --- roles/httpd/website/templates/website.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/httpd/website/templates/website.conf b/roles/httpd/website/templates/website.conf index 27510e46f7..026b2ffe84 100644 --- a/roles/httpd/website/templates/website.conf +++ b/roles/httpd/website/templates/website.conf @@ -16,14 +16,14 @@ ProxyPass "/.well-known/acme-challenge" "http://certgetter01/.well-known/acme-challenge" {% endif %} -{% if site_name == "fedoraproject.org" || site_name == "hotspot-nocache.fedoraproject.org" %} +{% if site_name == "fedoraproject.org" or site_name == "hotspot-nocache.fedoraproject.org" %} 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" || site_name == "hotspot-nocache.fedoraproject.org" %} + {% if site_name == "fedoraproject.org" or site_name == "hotspot-nocache.fedoraproject.org" %} RewriteCond %{REQUEST_URI} !/static/hotspot.txt {% endif %} RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]