X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2e1417eb08f18ffebcec76d994777d2413e0fcde..de5cd1e12b2fa626344a183c509a88e29439f4e1:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9592d36f5..cda524ae1 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -1,47 +1,58 @@
 #!/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",
-
+	#adminuser => ["yourname", ],
+	adminemail => 'me@myhost',
+	
 	# Be sure to customise these..
 	srcdir => "/path/to/source",
-	templatedir => "/path/to/templates",
 	destdir => "/var/www/wiki",
-
+	
 	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,
+	#rcs => "", # don't use svn
+	rcs => "svn", # use svn (the default)
 	svnrepo => "/svn/wiki",
-
-	# Whether to enable a cgi wrapper.
-	cgiwrapper => 0,
+	svnpath => "trunk",
+
+	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",
+			# Enable mail notifications of commits.
+			notify => 1,
+		},
+		#{
+		#	# The cgi wrapper.
+		#	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};
+	# Generate rss feeds for pages?
+	rss => 1,
+	# Include discussion links on all pages?
+	discussion => 1,
+	# Time format (for strftime)
+	#timeformat => '%c',
+	# To change the enabled plugins, edit this list
+	#plugin => [qw{pagecount inline brokenlinks search smiley
+	#              htmlscrubber}],
+}