X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=ikiwiki.setup;h=865da28f67544f37343cf24dbecbe882c32b0f99;hb=aa86026ab68bfcc7adeb354bc2805f92ff38034f;hp=d006f8cfb6e290c29de06f2ffda3fbc564394229;hpb=75a985002c9cd2833fa32ae6ef97206d72b5ab96;p=cworth.org diff --git a/ikiwiki.setup b/ikiwiki.setup index d006f8c..865da28 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -16,15 +16,15 @@ use IkiWiki::Setup::Standard { url => "http://cworth.org", #cgiurl => "http://example.org/ikiwiki.cgi", - #templatedir => "/usr/share/ikiwiki/templates", + templatedir => "/srv/cworth.org/wiki/checkout/templates", underlaydir => "/dev/null", # Git stuff. - #rcs => "git", + rcs => "git", #historyurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]", #diffurl => "http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]", - #gitorigin_branch => "origin", - #gitmaster_branch => "master", + gitorigin_branch => "origin", + gitmaster_branch => "master", wrappers => [ #{ @@ -33,16 +33,16 @@ use IkiWiki::Setup::Standard { # wrapper => "/var/www/wiki/ikiwiki.cgi", # wrappermode => "06755", #}, - #{ - # # The git post-update wrapper. - # # Note that this will overwrite any existing - # # post-update hook script, which may not be - # # what you want. - # wrapper => "/git/wiki.git/hooks/post-update", - # wrappermode => "04755", - # # Enable mail notifications of commits. - # notify => 1, - #}, + { + # The git post-update wrapper. + # Note that this will overwrite any existing + # post-update hook script, which may not be + # what you want. + wrapper => "/srv/cworth.org/wiki/hooks/ikiwiki-post-update", + wrappermode => "04755", + # Enable mail notifications of commits. + notify => 1, + }, ], # Generate rss feeds for blogs?