committing changes for conflict test

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9592d36f52ecd068e60d0cf2640a7f2fe77e0e06..e60d0f40709f0ab5cd0a8a5a1ce020b53396382f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -1,18 +1,17 @@
 #!/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.
 
-%config=(%config,
-       
+use IkiWiki::Setup::Standard {
        wikiname => "MyWiki",
 
        # Be sure to customise these..
        srcdir => "/path/to/source",
-       templatedir => "/path/to/templates",
        destdir => "/var/www/wiki",
+       templatedir => "/usr/share/ikiwiki/templates",
 
        url => "http://myhost/wiki",
        cgiurl => "http://myhost/ikiwiki.cgi",
@@ -22,26 +21,25 @@
        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 => "$config{svnrepo}/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,
-
-);     
-
-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};
+}