From b1eea42305acc61d3990f8ced4e0f52cac98b7a3 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 7 May 2015 18:27:37 +0000
Subject: [PATCH] Fix up apache 2.2 vs 2.4 stuff

---
 roles/freemedia/files/freemedia-app.conf            | 12 ++++++++++++
 .../geoip-city-wsgi/app/files/geoip-city-wsgi.conf  | 13 ++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/roles/freemedia/files/freemedia-app.conf b/roles/freemedia/files/freemedia-app.conf
index 7c727e5119..d35ee167a4 100644
--- a/roles/freemedia/files/freemedia-app.conf
+++ b/roles/freemedia/files/freemedia-app.conf
@@ -1 +1,13 @@
 Alias /freemedia /srv/web/freemedia/
+
+<Location /freemedia>
+    <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/roles/geoip-city-wsgi/app/files/geoip-city-wsgi.conf b/roles/geoip-city-wsgi/app/files/geoip-city-wsgi.conf
index 89123ee3ad..633ba98b39 100644
--- a/roles/geoip-city-wsgi/app/files/geoip-city-wsgi.conf
+++ b/roles/geoip-city-wsgi/app/files/geoip-city-wsgi.conf
@@ -3,7 +3,14 @@ WSGIDaemonProcess geoip-city user=apache processes=45 threads=1 display-name=geo
 WSGIScriptAlias /city /usr/share/geoip-city-wsgi/geoip-city.wsgi
 
 <Location /city>
-    WSGIProcessGroup geoip-city
-    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>
+