commit 3adbdbc85ea38a4e0ed934d5970d74bd45a05503
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Nov 25 18:43:32 2016 +0100
Update redirects
roles/fedora-web/main/files/redirects.conf.prod | 8 ++------
roles/fedora-web/main/templates/sponsor.conf | 1 -
2 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/roles/fedora-web/main/files/redirects.conf.prod
b/roles/fedora-web/main/files/redirects.conf.prod
index 4b59472..0f849cf 100644
--- a/roles/fedora-web/main/files/redirects.conf.prod
+++ b/roles/fedora-web/main/files/redirects.conf.prod
@@ -11,13 +11,9 @@ RewriteRule .* - [F]
RewriteCond %{REMOTE_ADDR} ^95\.24\.237\.122$
RewriteRule .* - [F]
-# Sponsor links should go to the specific sponsor page
-RewriteRule ^(/.*)?/sponsors.*$
https://getfedora.org/sponsors [R=301,L]
RewriteEngine On
-RewriteCond %{HTTPS} off
-RewriteRule ^/([^/]+/)?(keys|verify)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
+RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
+RewriteRule ^(.*)$
https://rpmfusion.org/$1 [R=301,L]
-RewriteCond %{HTTP_REFERER} .*fedorproject.*
-RewriteRule .*
http://mmcgrath.fedorapeople.org/spam.html [R=301,L]
diff --git a/roles/fedora-web/main/templates/sponsor.conf
b/roles/fedora-web/main/templates/sponsor.conf
index 2ee4235..e69de29 100644
--- a/roles/fedora-web/main/templates/sponsor.conf
+++ b/roles/fedora-web/main/templates/sponsor.conf
@@ -1 +0,0 @@
-Alias /static/js/sponsor.js /srv/web/{{website}}/static/js/sponsors/{{sponsor}}.js