From 6a98afc64962aadcf4390c80a0cedd9e9f92f310 Mon Sep 17 00:00:00 2001
From: James Laska <jlaska@ansible.com>
Date: Mon, 10 Mar 2014 12:08:37 -0400
Subject: [PATCH] Support httpd 2.2 and 2.4 config formats

Create new-style debian apache-2.4 conf-enabled/ symlinks
---
 config/{awx.conf => awx-httpd-443.conf}      | 18 ++++++++++++++----
 config/{awx-plain.conf => awx-httpd-80.conf} | 18 ++++++++++++++----
 setup.py                                     |  4 +++-
 3 files changed, 31 insertions(+), 9 deletions(-)
 rename config/{awx.conf => awx-httpd-443.conf} (74%)
 rename config/{awx-plain.conf => awx-httpd-80.conf} (76%)

diff --git a/config/awx.conf b/config/awx-httpd-443.conf
similarity index 74%
rename from config/awx.conf
rename to config/awx-httpd-443.conf
index acc1e0c282..e88c9ad9cc 100644
--- a/config/awx.conf
+++ b/config/awx-httpd-443.conf
@@ -21,14 +21,24 @@ LoadModule ssl_module modules/mod_ssl.so
 
   <Directory /var/lib/awx/>
     <Files wsgi.py>
-      Order deny,allow
-      Allow from all
+      <IfVersion >= 2.3>
+        Require all granted
+      </IfVersion>
+      <IfVersion < 2.3>
+        Order deny,allow
+        Allow from all
+      </IfVersion>
     </Files>
   </Directory>
 
   <Directory /var/lib/awx/public/>
-    Order deny,allow
-    Allow from all
+    <IfVersion >= 2.3>
+      Require all granted
+    </IfVersion>
+    <IfVersion < 2.3>
+      Order deny,allow
+      Allow from all
+    </IfVersion>
   </Directory>
 
 </VirtualHost>
diff --git a/config/awx-plain.conf b/config/awx-httpd-80.conf
similarity index 76%
rename from config/awx-plain.conf
rename to config/awx-httpd-80.conf
index 94c8f90e2f..bc4a9b2e8e 100644
--- a/config/awx-plain.conf
+++ b/config/awx-httpd-80.conf
@@ -24,14 +24,24 @@ WSGISocketPrefix /var/run/wsgi
 
   <Directory /var/lib/awx/>
     <Files wsgi.py>
-      Order deny,allow
-      Allow from all
+      <IfVersion >= 2.3>
+        Require all granted
+      </IfVersion>
+      <IfVersion < 2.3>
+        Order deny,allow
+        Allow from all
+      </IfVersion>
     </Files>
   </Directory>
 
   <Directory /var/lib/awx/public/>
-    Order deny,allow
-    Allow from all
+    <IfVersion >= 2.3>
+      Require all granted
+    </IfVersion>
+    <IfVersion < 2.3>
+      Order deny,allow
+      Allow from all
+    </IfVersion>
   </Directory>
 
 
diff --git a/setup.py b/setup.py
index 7e3284d4e2..d0a1801059 100755
--- a/setup.py
+++ b/setup.py
@@ -143,7 +143,9 @@ setup(
             ("%s" % homedir,        ["config/wsgi.py",
                                      "awx/static/favicon.ico",
                                     ]),
-            ("%s" % webconfig,      ["config/awx.conf","config/awx-plain.conf"]),
+            ("%s" % webconfig,      ["config/awx-httpd-80.conf",
+                                     "config/awx-httpd-443.conf",
+                                    ]),
         ]
     ),
     options = {