Change projects to point to projectdb

[sipb-www.git] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 81df5cf47a8456977f74b71331f8f862621039d2..bdb11aee05509f9fc9b8ba30ca8787559d27f002 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
@@ -49,7 +49,7 @@ my %common_setup_args = (
        # strftime format string to display date
        timeformat => '%c',
        # UTF-8 locale to use
-       #locale => 'en_US.UTF-8',
+       locale => 'en_US.UTF-8',
        # put user pages below specified page
        userdir => '',
        # how many backlinks to show before hiding excess (0 to show all)
@@ -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
@@ -111,7 +111,7 @@ my %common_setup_args = (
        # htmlscrubber plugin
        # PageSpec specifying pages not to scrub
        #htmlscrubber_skip => '!*/Discussion',
-       htmlscrubber_skip => 'calendar',
+       htmlscrubber_skip => 'calendar or office',
 
        # inline plugin
        # enable rss feeds by default?
@@ -208,9 +208,9 @@ if ($ENV{"IKIWIKI_PREVIEW_OUTPUT"}) {
 
   %setup_args = (
                 %common_setup_args,
-                srcdir => catdir($self_path, "wiki"),
+                srcdir => catdir($git_root, "wiki"),
                 destdir => $ENV{"IKIWIKI_PREVIEW_OUTPUT"},
-                url => 'http://sipb.mit.edu',
+                url => 'https://sipb.mit.edu',
                 templatedir => catdir($ENV{"IKIWIKI_SHARE"}, 'templates'),
                 underlaydir => catdir($ENV{"IKIWIKI_SHARE"}, 'basewiki'),
                );
@@ -222,7 +222,7 @@ if ($ENV{"IKIWIKI_PREVIEW_OUTPUT"}) {
        # where to build the wiki
        destdir => '/afs/sipb.mit.edu/project/sipb-www/Scripts/wiki',
        # base url to the wiki
-       url => 'http://sipb.mit.edu',
+       url => 'https://sipb.mit.edu',
        # url to the ikiwiki.cgi
        cgiurl => 'https://sipb.mit.edu:444/ikiwiki.cgi',
        # filename of cgi wrapper to generate
@@ -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/wiki.git/history/HEAD:/[[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/wiki.git/blobdiff/[[sha1_parent]]..[[sha1_commit]]:/[[file]]',
        # where to pull and push changes (set to empty string to disable)
        #gitorigin_branch => 'origin',
        # branch that the wiki is stored in