Accept PATH_INFO on gitweb.cgi

[sipb-www.git] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index b44c2c8e91446adf8cc3d711c12631dcce542f5e..245d7df74811213d7f4f5c1d37d13ca689e2c548 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -23,7 +23,7 @@ my %common_setup_args = (
        # IMPORTANT! If you add plugins that involve interface changes, you
        # will need to modify our templates to allow this, as our custom
        # template does not support them yet. See ~/src/ikiwiki/templates
-       add_plugins => [qw(goodstuff html httpauth rename remove)],
+       add_plugins => [qw(goodstuff html httpauth rename remove 404 attachment color)],
        # plugins to disable
        # IMPORTANT! If you reenable passwordauth/openid, you need to
        # do some modifications described in TODO.SIPB in the source-tree
@@ -83,9 +83,9 @@ my %common_setup_args = (
 
        # attachment plugin
        # enhanced PageSpec specifying what attachments are allowed
-       #allowed_attachments => 'virusfree() and mimetype(image/*) and maxsize(50kb)',
+       allowed_attachments => 'virusfree() and (mimetype(image/*) or mimetype(application/pdf)) and maxsize(10000kb)',
        # virus checker program (reads STDIN, returns nonzero if virus found)
-       #virus_checker => 'clamdscan -',
+       virus_checker => 'clamscan -',
 
        # calendar plugin
        # base of the archives hierarchy
@@ -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