X-Git-Url: https://sipb.mit.edu/gitweb.cgi/sipb-www.git/blobdiff_plain/a4a8dbd5288b2f0d304a603e7511cea985787be3..d7777b1ad7fb9ab53c8f5777bc64fbfcd805a3e1:/ikiwiki.setup diff --git a/ikiwiki.setup b/ikiwiki.setup index 3078450..3adcc98 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -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