From 451e47906520e79c59cd624fff1e8b65d569ae7a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Wed, 4 May 2011 21:54:18 -0400 Subject: [PATCH] Switch from cgit to gitweb Signed-off-by: Anders Kaseorg --- .htaccess | 1 + ikiwiki.setup | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index 0fabfde..01e7d09 100644 --- a/.htaccess +++ b/.htaccess @@ -15,6 +15,7 @@ RewriteRule ^(.*)$ http://sipb.mit.edu/$1 [R=301,L] # Serve some CGI scripts from _wiki-cgi RewriteRule ^ikiwiki.cgi$ _wiki-cgi/ikiwiki.cgi [L] RewriteRule ^update.cgi$ _wiki-cgi/update.cgi [L] +RewriteRule ^gitweb.cgi$ _wiki-cgi/gitweb.cgi [L] # Trailing-slash directories served from _wiki RewriteCond %{DOCUMENT_ROOT}/_wiki%{REQUEST_URI} -d diff --git a/ikiwiki.setup b/ikiwiki.setup index 3078450..245d7df 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -246,9 +246,9 @@ if ($ENV{"IKIWIKI_PREVIEW_OUTPUT"}) { # unix users whose commits should be checked by the pre-receive hook #untrusted_committers => [], # gitweb url to show file history ([[file]] substituted) - historyurl => '/cgit/cgit.cgi/wiki/log/[[file]]', + historyurl => '/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) - diffurl => '/cgit/cgit.cgi/wiki/diff/?id=[[sha1_commit]]', + diffurl => '/gitweb.cgi?p=wiki.git;a=commitdiff;h=[[sha1_commit]]', # where to pull and push changes (set to empty string to disable) #gitorigin_branch => 'origin', # branch that the wiki is stored in -- 2.45.0