From 99ae0159bbe44a13832774e2c55431c47f79d47f Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sun, 9 Jun 2013 10:39:41 +0000
Subject: Add rewrite rules for cgit and move some apache configuration to a
 better place

---
 modules/cgit/templates/vhost.conf  | 8 ++++++++
 modules/cgit/templates/webapp.conf | 9 ++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'modules')

diff --git a/modules/cgit/templates/vhost.conf b/modules/cgit/templates/vhost.conf
index c33efe84..9beab703 100644
--- a/modules/cgit/templates/vhost.conf
+++ b/modules/cgit/templates/vhost.conf
@@ -1,2 +1,10 @@
 Alias /cgit-data /usr/share/cgit
 ScriptAlias / /var/www/cgi-bin/cgit
+
+<Directory /usr/share/cgit>
+    Order allow,deny
+    Allow from all
+</Directory>
+
+RewriteEngine On
+RewriteRule ^(.*)$ /?url=$1   [L,QSA]
diff --git a/modules/cgit/templates/webapp.conf b/modules/cgit/templates/webapp.conf
index 109b5e3f..4e1d8289 100644
--- a/modules/cgit/templates/webapp.conf
+++ b/modules/cgit/templates/webapp.conf
@@ -1,8 +1,3 @@
-# cgit configuration
-# disabled 
+# Disable standard cgit configuration
 #Alias /cgit-data /usr/share/cgit
-
-<Directory /usr/share/cgit>
-    Order allow,deny
-    Allow from all
-</Directory>
+#ScriptAlias /cgit /var/www/cgi-bin/cgit
-- 
cgit v1.2.1