diff options
author | Colin Guthrie <colin@mageia.org> | 2013-06-09 10:39:41 +0000 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2013-06-09 10:39:41 +0000 |
commit | 99ae0159bbe44a13832774e2c55431c47f79d47f (patch) | |
tree | d39cde90d16478f2bd7b3e1a7009307f15c7720e | |
parent | 967d3b4ea70f33cf034a4bed7d04243856658200 (diff) | |
download | puppet-99ae0159bbe44a13832774e2c55431c47f79d47f.tar puppet-99ae0159bbe44a13832774e2c55431c47f79d47f.tar.gz puppet-99ae0159bbe44a13832774e2c55431c47f79d47f.tar.bz2 puppet-99ae0159bbe44a13832774e2c55431c47f79d47f.tar.xz puppet-99ae0159bbe44a13832774e2c55431c47f79d47f.zip |
Add rewrite rules for cgit and move some apache configuration to a better place
-rw-r--r-- | modules/cgit/templates/vhost.conf | 8 | ||||
-rw-r--r-- | modules/cgit/templates/webapp.conf | 9 |
2 files changed, 10 insertions, 7 deletions
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 |