From a4a3080f86f71b45acc1b315316ae41e162627c8 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Mon, 17 Aug 2015 13:37:02 +0000
Subject: [PATCH] Make all redirects be 302

This will allow us more flexibility for moving redirects around.
It will result in less cached redirect entries, and as such more
requests to the proxies, but since those requests are handled by
the reverse proxies themselves, and within apache, those should
not take that much extra processing.

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
---
 playbooks/include/proxies-redirects.yml      | 10 ----------
 roles/httpd/redirect/templates/redirect.conf |  2 +-
 roles/httpd/redirect/vars/main.yml           |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/playbooks/include/proxies-redirects.yml b/playbooks/include/proxies-redirects.yml
index 05fbc8e3ce..14f80cecf8 100644
--- a/playbooks/include/proxies-redirects.yml
+++ b/playbooks/include/proxies-redirects.yml
@@ -51,37 +51,31 @@
     name: bodhi
     website: bodhi.fedoraproject.org
     target: https://admin.fedoraproject.org/updates/
-    status: 302
 
   - role: httpd/redirect
     name: get-fedora
     website: get.fedoraproject.org
     target: https://getfedora.org/
-    status: 302
 
   - role: httpd/redirect
     name: flocktofedora
     website: flocktofedora.org
     target: http://www.flocktofedora.org/
-    status: 302
 
   - role: httpd/redirect
     name: fedoramy
     website: fedora.my
     target: http://www.fedora.my/
-    status: 302
 
   - role: httpd/redirect
     name: join-fedora
     website: join.fedoraproject.org
     target: https://fedoraproject.org/wiki/Join
-    status: 302
 
   - role: httpd/redirect
     name: get-help
     website: help.fedoraproject.org
     target: https://fedoraproject.org/get-help
-    status: 302
 
   - role: httpd/redirect
     name: l10n
@@ -161,7 +155,6 @@
     name: fonts-wiki
     website: fonts.fedoraproject.org
     target: https://fedoraproject.org/wiki/Category:Fonts_SIG
-    status: 302
 
 
   # Releng
@@ -210,13 +203,11 @@
     name: it-fedoracommunity-redirect
     website: it.fedoracommunity.org
     target: http://www.fedoraonline.it/
-    status: 302
 
   - role: httpd/redirect
     name: uk-fedoracommunity-redirect
     website: uk.fedoracommunity.org
     target: http://www.fedora-uk.org/
-    status: 302
 
 
   # Spins
@@ -224,7 +215,6 @@
     name: kde
     website: kde.fedoraproject.org
     target: https://spins.fedoraproject.org/kde/
-    status: 302
 
 
   # Various sites that we are friends with
diff --git a/roles/httpd/redirect/templates/redirect.conf b/roles/httpd/redirect/templates/redirect.conf
index 719483b517..91c50d8e8c 100644
--- a/roles/httpd/redirect/templates/redirect.conf
+++ b/roles/httpd/redirect/templates/redirect.conf
@@ -1 +1 @@
-Redirect {{ status }} {{ path }} {{ target }}
+Redirect 302 {{ path }} {{ target }}
diff --git a/roles/httpd/redirect/vars/main.yml b/roles/httpd/redirect/vars/main.yml
index 2d7d5c71ed..ca81e381c2 100644
--- a/roles/httpd/redirect/vars/main.yml
+++ b/roles/httpd/redirect/vars/main.yml
@@ -1,2 +1 @@
-status: 301
 path: /