add news item for ikiwiki 1.9

[git.ikiwiki.info.git] / doc / ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index c03092b7acd5b1e28242a02ef9867ef3b596e7a3..8bc0e333609b5a0888fb518ea2acde215c33bb17 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -1,45 +1,77 @@
 #!/usr/bin/perl
 # Configuration file for ikiwiki.
 #!/usr/bin/perl
 # Configuration file for ikiwiki.

-# Passing this to ikiwiki --setup will make ikiwiki generate two
-# wrapper programs, one for cgi and one for a subversion post-commit hook.
+# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and 
+# build the wiki.

 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 use IkiWiki::Setup::Standard {
        wikiname => "MyWiki",
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 use IkiWiki::Setup::Standard {
        wikiname => "MyWiki",

-
+       #adminuser => ["yourname", ],
+       adminemail => 'me@myhost',
+       

        # Be sure to customise these..
        srcdir => "/path/to/source",
        # Be sure to customise these..
        srcdir => "/path/to/source",

-       templatedir => "/path/to/templates",

        destdir => "/var/www/wiki",
        destdir => "/var/www/wiki",

-
+       

        url => "http://myhost/wiki",
        cgiurl => "http://myhost/ikiwiki.cgi",
        url => "http://myhost/wiki",
        cgiurl => "http://myhost/ikiwiki.cgi",

-       #historyurl => "http://svn.myhost/trunk/[[]]",
+       #templatedir => "/usr/share/ikiwiki/templates",

        
        

-       # Whether to integrate with svn.
-       svn => 1,
+       # Subversion stuff.
+       rcs => "svn",
+       #historyurl => "http://svn.myhost/trunk/[[file]]",
+       #diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",

        svnrepo => "/svn/wiki",
        svnrepo => "/svn/wiki",

+       svnpath => "trunk",
+
+       # Git stuff.
+       #rcs => "git",
+       #historyurl => "http://git.host/gitweb.cgi?p=wiki.git;a=history;f=[[file]]",
+       #diffurl => "http://git.host/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",

 
        wrappers => [
 
        wrappers => [

+               #{
+               #       # The cgi wrapper.
+               #       cgi => 1,
+               #       wrapper => "/var/www/wiki/ikiwiki.cgi",
+               #       wrappermode => "06755",
+               #},

                {
                {

-                       # The svn wrapper.
-                       # Note that this will overwrite any exsting
+                       # The svn post-commit wrapper.
+                       # Note that this will overwrite any existing

                        # post-commit hook script, which may not be
                        # what you want.
                        # post-commit hook script, which may not be
                        # what you want.

-                       wrapper => "$config{svnrepo}/hooks/post-commit",
-                       wrappermode => 04755,
-               },
-               {
-                       # The cgi wrapper.
-                       #cgiwrapper => {
-                       #       cgi => 1,
-                       #       wrapper => "/var/www/wiki/ikiwiki.cgi",
-                       #       wrappermode => 06755,
-                       #},
+                       wrapper => "/svn/wikirepo/hooks/post-commit",
+                       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 => "/git/wikirepo/.git/hooks/post-update",
+               #       wrappermode => "04755",
+               #       # Enable mail notifications of commits.
+               #       notify => 1,
+               #},

        ],
        
        # Can anonymous web users edit pages?
        #anonok => 1,
        ],
        
        # Can anonymous web users edit pages?
        #anonok => 1,

+       # Generate rss feeds for pages?
+       rss => 1,
+       # Urls to ping with XML-RPC when rss feeds are updated
+       #pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
+       # Include discussion links on all pages?
+       discussion => 1,
+       # Time format (for strftime)
+       #timeformat => '%c',
+       
+       # To add plugins, list them here.
+       #add_plugins => [qw{pagecount brokenlinks search smiley wikitext}],
+       # If you want to disable any of the default plugins, list them here.
+       #disable_plugins => [qw{inline htmlscrubber}],

 }
 }