Turn on the basic git functionality

diff --git a/ikiwiki.setup b/ikiwiki.setup
index d006f8cfb6e290c29de06f2ffda3fbc564394229..cec65c23608dc02926b84431a7fdef9608cd48a4 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -20,11 +20,11 @@ use IkiWiki::Setup::Standard {
        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?