From ba59adcfdbf9aa51cbd5051242140ada5ab24789 Mon Sep 17 00:00:00 2001
From: Matt Domsch <Matt_Domsch@dell.com>
Date: Fri, 14 Jun 2013 20:39:41 +0000
Subject: [PATCH] more mirrorlist changes coming from puppet

---
 files/mirrorlist/mirrorlist-server.conf | 28 ++++++++++++++++++++-----
 files/mirrorlist/mm_sync_data           |  2 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/files/mirrorlist/mirrorlist-server.conf b/files/mirrorlist/mirrorlist-server.conf
index 570c7ddfee..6d81bf15ca 100644
--- a/files/mirrorlist/mirrorlist-server.conf
+++ b/files/mirrorlist/mirrorlist-server.conf
@@ -8,19 +8,37 @@ Alias /static /var/lib/mirrormanager/mirrorlists/static/
         ExpiresDefault "modification plus 1 hour"
 </Directory>
 
-WSGIDaemonProcess mirrorlist user=apache processes=45 threads=1 display-name=mirrorlist maximum-requests=1000
+WSGIDaemonProcess mirrorlist user=apache processes=6 threads=25 display-name=mirrorlist maximum-requests=1000
 
 WSGIScriptAlias /metalink /usr/share/mirrormanager/mirrorlist-server/mirrorlist_client.wsgi
 WSGIScriptAlias /mirrorlist /usr/share/mirrormanager/mirrorlist-server/mirrorlist_client.wsgi
 
+# Set this if you do not have a Reverse Proxy (HTTP Accelerator) that
+# is in front of your application server running this code.
+# SetEnv mirrorlist_client.noreverseproxy 1
+
 <Location /mirrorlist>
     WSGIProcessGroup mirrorlist
-    Order deny,allow
-    Allow from all
+    <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 /metalink>
     WSGIProcessGroup mirrorlist
-    Order deny,allow
-    Allow from all
+    <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>
diff --git a/files/mirrorlist/mm_sync_data b/files/mirrorlist/mm_sync_data
index 2e56bc44b9..e48bdc7b3b 100755
--- a/files/mirrorlist/mm_sync_data
+++ b/files/mirrorlist/mm_sync_data
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 rsync -az --delete-delay --delay-updates --delete mirrormanager@bapp02:/var/lib/mirrormanager/ /var/lib/mirrormanager/
-killall -HUP mirrorlist_server.py
+kill -HUP $(cat /var/run/mirrormanager/mirrorlist_server.pid)