From 7ead116450e47e8bda2152e59d3f9acbb434ae18 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Thu, 7 May 2015 07:35:14 +0000
Subject: [PATCH] Enable redirect for the new MM2 publiclist

---
 .../templates/mirrorlist-server.conf            | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
index 53f0dfe851..7437b7a96a 100644
--- a/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
+++ b/roles/mirrormanager/mirrorlist2/templates/mirrorlist-server.conf
@@ -4,10 +4,7 @@
 {% if env == "staging" %}
 Redirect /publiclist https://admin.stg.fedoraproject.org/mirrormanager2/
 {% else %}
-# Do not enable until mm2 is live
-#Redirect /publiclist https://admin.fedoraproject.org/mirrormanager2/
-Alias /mirrorlists /var/lib/mirrormanager/mirrorlists/
-Alias /publiclist /var/lib/mirrormanager/mirrorlists/publiclist/
+Redirect /publiclist https://admin.fedoraproject.org/mirrormanager/
 Alias /static /var/lib/mirrormanager/mirrorlists/static/
 {% endif %}
 
@@ -50,18 +47,6 @@ WSGIScriptAlias /mirrorlist /usr/share/mirrormanager2/mirrorlist_client.wsgi
     </IfModule>
 </Location>
 
-<Location /publiclist>
-    <IfModule mod_authz_core.c>
-        # Apache 2.4
-        Require all granted
-    </IfModule>
-    <IfModule !mod_authz_core.c>
-        # Apache 2.2
-        Order deny,allow
-        Allow from all
-    </IfModule>
-</Location>
-
 <Location /static>
     <IfModule mod_authz_core.c>
         # Apache 2.4