From cf582b5c3e71baeb11a984a69942f246700a610f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mon, 20 Jul 2015 11:35:08 +0200
Subject: [PATCH] Adjust the apache configuration for the docs server

---
 roles/pagure/frontend/files/0_pagure.conf   | 10 +---------
 roles/pagure/frontend/templates/pagure.conf | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/roles/pagure/frontend/files/0_pagure.conf b/roles/pagure/frontend/files/0_pagure.conf
index 0e96006b0c..39df8f9892 100644
--- a/roles/pagure/frontend/files/0_pagure.conf
+++ b/roles/pagure/frontend/files/0_pagure.conf
@@ -20,16 +20,8 @@
 #TODO: move this to 443 when we have the ssl certs
 
 <VirtualHost docs.pagure.org:80>
-    WSGIDaemonProcess pagure user=git group=git maximum-requests=50000 display-name=pagure processes=8 threads=4 inactivity-timeout=300
 
-    WSGISocketPrefix run/wsgi
-    WSGIRestrictStdout On
-    WSGIRestrictSignal Off
-    WSGIPythonOptimize 1
-
-    WSGIScriptAlias / /usr/share/pagure/doc_pagure.wsgi
-
-    <Location />
+    <Location /d>
         WSGIProcessGroup pagure
         <IfModule mod_authz_core.c>
             # Apache 2.4
diff --git a/roles/pagure/frontend/templates/pagure.conf b/roles/pagure/frontend/templates/pagure.conf
index eb688ce276..8ef98b9e6c 100644
--- a/roles/pagure/frontend/templates/pagure.conf
+++ b/roles/pagure/frontend/templates/pagure.conf
@@ -23,6 +23,7 @@ WSGIPythonOptimize 1
 WSGIPassAuthorization On
 
 WSGIScriptAlias / /var/www/pagure.wsgi
+WSGIScriptAlias /d /var/www/docs_pagure.wsgi
 
 <Location />
     WSGIProcessGroup pagure
@@ -50,6 +51,19 @@ WSGIScriptAlias / /var/www/pagure.wsgi
     </IfModule>
 </Location>
 
+<Location /d>
+    WSGIProcessGroup pagure
+    <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>
+
 <Directory /var/www/releases>
   Options +Indexes
 </Directory>