committing changes for conflict test

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

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index e8048c3b0a3a1fcc49e8bd275a66e32e500340be..e60d0f40709f0ab5cd0a8a5a1ce020b53396382f 100644 (file)
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -5,13 +5,13 @@
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
 

-%setup=(
+use IkiWiki::Setup::Standard {

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

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

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

+       templatedir => "/usr/share/ikiwiki/templates",

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


@@ -21,21 +21,25 @@
        svn => 1,
        svnrepo => "/svn/wiki",
 
        svn => 1,
        svnrepo => "/svn/wiki",
 

-       # The svn wrapper.
-       svnwrapper => {
-               # 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,
-       },
+       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,
+                       #},
+               },
+       ],

        
        

-       # 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,

-);
+}