Add templates to revision control, and configure to use these.

[cworth.org] / ikiwiki.setup

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 31561e20fd997b8befdf6e924583b8f9cc192fea..865da28f67544f37343cf24dbecbe882c32b0f99 100644 (file)
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -6,42 +6,25 @@
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 use IkiWiki::Setup::Standard {
-       wikiname => "MyWiki",
+       wikiname => "cworth.org",
        #adminuser => ["yourname", ],
-       adminemail => 'me@example.org',
+       adminemail => 'cworth@cworth.org',
 
        # Be sure to customise these..
-       srcdir => "/path/to/source",
-       destdir => "/var/www/wiki",
+       srcdir => "/srv/cworth.org/wiki/checkout/src",
+       destdir => "/srv/cworth.org/www",
 
-       url => "http://example.org/wiki",
-       cgiurl => "http://example.org/ikiwiki.cgi",
-       #templatedir => "/usr/share/ikiwiki/templates",
-       #underlaydir => "/usr/share/ikiwiki/basewiki",
-
-       # Subversion stuff.
-       #rcs => "svn",
-       #historyurl => "http://svn.example.org/trunk/[[file]]",
-       #diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-       #svnrepo => "/svn/wiki",
-       #svnpath => "trunk",
+       url => "http://cworth.org",
+       #cgiurl => "http://example.org/ikiwiki.cgi",
+       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",
-
-       # Tla stuff.
-       #rcs => "tla"
-       #historyurl => ??,
-       #diffurl => ??,
-
-       # Mercurial stuff.
-       #rcs => "mercurial",
-       #historyurl => "http://localhost:8000/", # hg serve'd local repository
-       #diffurl => "http://localhost:8000/?fd=[[changeset]];file=[[file]]",
+       gitorigin_branch => "origin",
+       gitmaster_branch => "master",
 
        wrappers => [
                #{
@@ -50,29 +33,16 @@ use IkiWiki::Setup::Standard {
                #       wrapper => "/var/www/wiki/ikiwiki.cgi",
                #       wrappermode => "06755",
                #},
-               #{
-               #       # The svn post-commit wrapper.
-               #       # Note that this will overwrite any existing
-               #       # post-commit hook script, which may not be
-               #       # what you want.
-               #       wrapper => "/svn/wikirepo/hooks/post-commit",
-               #       wrappermode => "04755",
-               #       # Enable mail notifications of commits.
-               #       notify => 1,
-               #       # Log to syslog since svn post-commit hooks
-               #       # hide output and errors.
-               #       syslog => 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 => "/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?