load index for all cgi scripts, fixes links on RecentChanges

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9592d36f52ecd068e60d0cf2640a7f2fe77e0e06..b81983080fdd73830bdd2bffc1d2210edebc9339 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -1,47 +1,49 @@
 #!/usr/bin/perl
 # Configuration file for ikiwiki.
 #!/usr/bin/perl
 # Configuration file for ikiwiki.

-# Passing this to ikiwiki --setup will make ikiwiki generate tw
+# Passing this to ikiwiki --setup will make ikiwiki generate two

 # wrapper programs, one for cgi and one for a subversion post-commit hook.
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 # wrapper programs, one for cgi and one for a subversion post-commit hook.
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 

-%config=(%config,
-       
+use IkiWiki::Setup::Standard {

        wikiname => "MyWiki",
        wikiname => "MyWiki",

-
+       #adminuser => ["yourname", ],
+       

        # 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/[[]]",
+       #historyurl => "http://svn.myhost/trunk/[[file]]",
+       #diffurl => "http://svn.someurl/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
+       #templatedir => "/usr/share/ikiwiki/templates",

        
        # Whether to integrate with svn.
        svn => 1,
        svnrepo => "/svn/wiki",
 
        
        # Whether to integrate with svn.
        svn => 1,
        svnrepo => "/svn/wiki",
 

-       # Whether to enable a cgi wrapper.
-       cgiwrapper => 0,
+       wrappers => [
+               {
+                       # The svn wrapper.
+                       # Note that this will overwrite any exsting
+                       # post-commit hook script, which may not be
+                       # what you want.
+                       wrapper => "/svn/wiki/hooks/post-commit",
+                       wrappermode => 04755,
+               },
+               {
+                       # The cgi wrapper.
+                       #cgiwrapper => {
+                       #       cgi => 1,
+                       #       wrapper => "/var/www/wiki/ikiwiki.cgi",
+                       #       wrappermode => 06755,
+                       #},
+               },
+       ],
+       

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

-
-);     
-
-gen_wrapper(%config,
-       
-       cgi => 1,
-       wrapper => "$config{destdir}/ikiwiki.cgi",
-       wrappermode => 06755,
-       
-) if $config{cgiwrapper};
-
-gen_wrapper(%config,
-       
-       # Note that this will overwrite any exsting post-commit hoo
-       # script, which may not be what you want.
-       wrapper => "$config{svnrepo}/hooks/post-commit",
-       wrappermode => 04755,
-
-) if $config{svn};
+       # Generate rss feeds for pages?
+       #rss => 1,
+}