From a398ff8bc1a5ee516a8c904f299ddfa77e4439ad Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mon, 8 Dec 2014 20:57:25 +0000 Subject: [PATCH] Whitespace. --- roles/httpd/reverseproxy/templates/reversepassproxy.id.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/httpd/reverseproxy/templates/reversepassproxy.id.conf b/roles/httpd/reverseproxy/templates/reversepassproxy.id.conf index 8693db5185..bfbff4f379 100644 --- a/roles/httpd/reverseproxy/templates/reversepassproxy.id.conf +++ b/roles/httpd/reverseproxy/templates/reversepassproxy.id.conf @@ -5,20 +5,24 @@ RewriteEngine on RewriteMap lowercase int:tolower + {% if env == "staging" %} RewriteCond ${lowercase:%{SERVER_NAME}} ^[a-z0-9-]+\.id\.stg\.fedoraproject\.org$ {% else %} RewriteCond ${lowercase:%{SERVER_NAME}} ^[a-z0-9-]+\.id\.fedoraproject\.org$ {% endif %} + RewriteRule ^(.+) ${lowercase:%{SERVER_NAME}}$1 [C] + {% if env == "staging" %} RewriteRule ^([a-z0-9-]+)\.id\.stg\.fedoraproject\.org/.* {{proxyurl}}/openid/id/$1/ [P,L] {% else %} RewriteRule ^([a-z0-9-]+)\.id\.fedoraproject\.org/.* {{proxyurl}}/openid/id/$1/ [P] {% endif %} + RewriteCond %{HTTPS} off RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L]