X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FGitalist.pm;h=28e79aed0f6e94a24f14dbe620532af60c9d2d59;hb=b7b5f98eaa67e9968382a34934e64a2330ea4d23;hp=b2a7746ee3eb4689684a74896794dc27f2ef8d5c;hpb=4a0a2afabdbeef0d1f353e5b4bba1553a8615af4;p=catagits%2FGitalist.git

diff --git a/lib/Gitalist.pm b/lib/Gitalist.pm
index b2a7746..28e79ae 100644
--- a/lib/Gitalist.pm
+++ b/lib/Gitalist.pm
@@ -14,7 +14,7 @@ use Catalyst qw/
                 SubRequest
 /;
 
-our $VERSION = '0.002009';
+our $VERSION = '0.003004';
 $VERSION = eval $VERSION;
 
 __PACKAGE__->config(
@@ -29,8 +29,13 @@ __PACKAGE__->setup();
 
 after prepare_path => sub {
     my ($ctx) = @_;
+    my $path = $ctx->req->uri->path;
     if ($ctx->req->param('a')) {
-        $ctx->request->uri->path('/legacy' . $ctx->request->uri->path);
+        $ctx->req->uri->path("/legacy$path");
+    }
+    
+    if($path =~ s/[.]json$// && $ctx->req->content_type eq 'application/json') {
+        $ctx->req->uri->path($path);
     }
 };
 
@@ -199,6 +204,14 @@ This example can be seen live here:
 
     http://example.gitalist.com
 
+=head2 Plack
+
+If you would like to run Gitalist under L<Plack> then one need only
+make use of L<plackup|search.cpan.org/perldoc?plackup> and the
+C<.psgi> found under C<scripts/>:
+
+    plackup script/gitalist_app.psgi
+
 =head1 CONFIGURATION
 
 The Gitalist config is loaded with L<Catalyst::Plugin::ConfigLoader>
@@ -216,8 +229,9 @@ Path to the C<git> binary.
 
 A directory containing the directories to show.
 
-If no repositories are found in this directory then Gitalist will
-search recursively in that directory for repositories.
+=item repos
+
+A list of directories containing repositories to show.
 
 =item search_recursively
 
@@ -247,7 +261,7 @@ visible. This is similar to C<gitweb>'s functionality.
 
 =item log
 
-The number of commits to show in the 
+The number of commits to show in the summary, shortlog and longlog views.
 
 =back
 
@@ -291,9 +305,16 @@ If you find the need to do some troubleshooting, you can call
 C<http://url_to_gitalist.fcgi?dump_info=1> and/or add export C<GITALIST_DEBUG=1>
 to the top of your F<gitalist.fcgi> file (just below the shebang line).
 
-Also, note that Apache will refuse C<%2F> in Gitalist URLs
-unless configured otherwise. Make sure C<AllowEncodedSlashes On>
-is in your F<httpd.conf> file in order for this to run smoothly.
+=head2 Apache config
+
+Apache will refuse C<%2F> in Gitalist URLs unless configured otherwise. Make
+sure C<AllowEncodedSlashes On> is in your F<httpd.conf> file in order for
+this to run smoothly.
+
+To have the static content served statically by Apache, instead of
+Gitalist, then add something like following line to your F<httpd.conf>:
+
+    Alias /static  /usr/local/share/perl/5.10.1/Gitalist/root/static
 
 =head1 CONTRIBUTING