X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2e1417eb08f18ffebcec76d994777d2413e0fcde..4895955ceaf264c5f17b10c4009e1ab1afcc55ee:/doc/ikiwiki.setup?ds=sidebyside

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9592d36f5..ee5e394be 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -1,47 +1,89 @@
 #!/usr/bin/perl
 # Configuration file for ikiwiki.
-# Passing this to ikiwiki --setup will make ikiwiki generate tw
-# 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.
 
-%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/[[]]",
+	#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",
+	svnpath => "trunk",
 
-	# Whether to enable a cgi wrapper.
-	cgiwrapper => 0,
-	# Can anonymous web users edit pages?
-	#anonok => 1,
+	# 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]]",
 
-);	
-
-gen_wrapper(%config,
-	
-	cgi => 1,
-	wrapper => "$config{destdir}/ikiwiki.cgi",
-	wrappermode => 06755,
+	wrappers => [
+		#{
+		#	# The cgi wrapper.
+		#	cgi => 1,
+		#	wrapper => "/var/www/wiki/ikiwiki.cgi",
+		#	wrappermode => "06755",
+		#},
+		{
+			# The svn post-commit wrapper.
+			# Note that this will overwrite any existing
+			# post-commit hook script, which may not be
+			# what you want.
+			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,
+		#},
+	],
 	
-) if $config{cgiwrapper};
-
-gen_wrapper(%config,
+	# 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,
+	# To exclude files matching a regexp from processing. This adds to
+	# the default exclude list.
+	#exclude => qr/\*.wav/,
+	# Time format (for strftime)
+	#timeformat => '%c',
+	# Locale to use. Must be a UTF-8 locale.
+	#locale => 'en_US.UTF-8',
+	# Only send cookies over SSL connections.
+	#sslcookie => 1,
+	# Logging settings:
+	verbose => 0,
+	syslog => 0,
 	
-	# 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};
+	# To add plugins, list them here.
+	#add_plugins => [qw{meta tag pagecount brokenlinks search smiley
+	#                   wikitext camelcase pagestats htmltidy fortune
+	#                   sidebar map rst toc}],
+	# If you want to disable any of the default plugins, list them here.
+	#disable_plugins => [qw{inline htmlscrubber}],
+}