Change projects to point to projectdb

[sipb-www.git] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 3078450b287e3c52814e6787ccf652de11fd3c18..bdb11aee05509f9fc9b8ba30ca8787559d27f002 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -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)
@@ -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?
@@ -210,7 +210,7 @@ if ($ENV{"IKIWIKI_PREVIEW_OUTPUT"}) {
                 %common_setup_args,
                 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