Switch from cgit to gitweb

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/.htaccess b/.htaccess
index 0fabfde7827d073a7cec2d1762f152b3d44554ba..01e7d0987dde29955ebf3c87ea437243b74cb31c 100644 (file)
--- 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]
 # 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
 
 # Trailing-slash directories served from _wiki
 RewriteCond %{DOCUMENT_ROOT}/_wiki%{REQUEST_URI} -d

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 3078450b287e3c52814e6787ccf652de11fd3c18..245d7df74811213d7f4f5c1d37d13ca689e2c548 100644 (file)
--- 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)
        # 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)
        # 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
        # where to pull and push changes (set to empty string to disable)
        #gitorigin_branch => 'origin',
        # branch that the wiki is stored in