diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-06-09 02:06:59 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-06-09 02:06:59 +0200 |
| commit | aef463c050add77d72259c5c9b630adbfb0409bb (patch) | |
| tree | 76e598c2ad57db9704e9d3e764add53e84c9b1c6 /ikiwiki.setup | |
| parent | af4e2bc8f1b5c450b22c19ff8e06ded02ef08cba (diff) | |
| parent | 0d9f8a5a6246924c5ac6f79cedd507b74477f06e (diff) | |
| download | web-aef463c050add77d72259c5c9b630adbfb0409bb.tar.gz web-aef463c050add77d72259c5c9b630adbfb0409bb.tar.bz2 web-aef463c050add77d72259c5c9b630adbfb0409bb.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/web
Diffstat (limited to 'ikiwiki.setup')
| -rw-r--r-- | ikiwiki.setup | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup index 0f912b82..1f58e0b8 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -51,7 +51,7 @@ IkiWiki::Setup::Standard->import({ # base url to the wiki url => 'http://darnassus.sceen.net/~hurd-web', # url to the ikiwiki.cgi - cgiurl => 'http://darnassus.sceen.net/hurd-web.cgi', + cgiurl => 'http://darnassus.sceen.net/cgi-bin/hurd-web', # filename of cgi wrapper to generate cgi_wrapper => $cgi_wrapper, # mode for cgi_wrapper (can safely be made suid) @@ -151,9 +151,9 @@ IkiWiki::Setup::Standard->import({ # unix users whose commits should be checked by the pre-receive hook #untrusted_committers => [], # gitweb url to show file history ([[file]] substituted) - historyurl => 'http://darnassus.sceen.net/gitweb/?p=hurd-web.git;a=history;f=[[file]];hb=HEAD', + historyurl => 'http://darnassus.sceen.net/cgit/hurd-web.git/log/[[file]]', # gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted) - diffurl => 'http://darnassus.sceen.net/gitweb/?p=hurd-web.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]', + diffurl => 'http://darnassus.sceen.net/cgit/hurd-web.git/commit/[[file]]?id=[[sha1_commit]]', # where to pull and push changes (set to empty string to disable) gitorigin_branch => $gitorigin_branch, # branch that the wiki is stored in @@ -211,10 +211,7 @@ IkiWiki::Setup::Standard->import({ # url pattern of openid realm (default is cgiurl) #openid_realm => '', # url to ikiwiki cgi to use for openid authentication (default is cgiurl) - # TODO. I don't know why I have to set this -- it's supposed to be the - # default -- but if this is not set, the OpenID provider redirects us - # to <http://darnassus.sceen.net/>, which doesn't work. - openid_cgiurl => 'http://darnassus.sceen.net/hurd-web.cgi', + #openid_cgiurl => '', # passwordauth plugin # a password that must be entered when signing up for an account @@ -328,9 +325,9 @@ IkiWiki::Setup::Standard->import({ # repolist plugin # URIs of repositories containing the wiki's source repositories => [qw{git://git.savannah.gnu.org/hurd/web.git - http://git.savannah.gnu.org/r/hurd/web.git - git://darnassus.sceen.net/~hurd-web/hurd-web.git - http://darnassus.sceen.net/gitweb/?p=hurd-web.git}], + http://git.savannah.gnu.org/cgit/hurd/web.git + git://darnassus.sceen.net/hurd-web.git + http://darnassus.sceen.net/cgit/hurd-web.git}], # search plugin # path to the omega cgi program |