summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-02-22 02:46:39 +0100
committerJonas Smedegaard <dr@jones.dk>2008-02-22 02:46:39 +0100
commit7bebdfed991617822e7a8056e141ae0832e5a938 (patch)
treee97c61dbb7bf4a7f04e270c8fc01b7527fff5b91
parent00213b908971a2ce241f4e11e6966382d25af376 (diff)
Sync ikiwiki.setup with ikiwiki 2.32.3.
-rw-r--r--ikiwiki.setup34
1 files changed, 22 insertions, 12 deletions
diff --git a/ikiwiki.setup b/ikiwiki.setup
index 3a0658e..c96a45f 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -23,7 +23,6 @@ use IkiWiki::Setup::Standard {
#rcs => "svn",
#historyurl => "http://svn.example.org/trunk/[[file]]",
#diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&amp;r1=[[r1]]&amp;r2=[[r2]]",
- #svnrepo => "/svn/wiki",
#svnpath => "trunk",
# Git stuff.
@@ -40,12 +39,19 @@ use IkiWiki::Setup::Standard {
# Mercurial stuff.
#rcs => "mercurial",
- #historyurl => "http://localhost:8000/", # hg serve'd local repository
+ #historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
+ # Bazaar stuff.
+ #rcs => "bzr",
+ #historyurl => "",
+ #diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
+
# Monotone stuff
#rcs => "monotone",
#mtnkey => "web\@machine.company.com",
+ #historyurl => "http://viewmtn.example.com/",
+ #diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
# Set if you want the wiki to sync on update and commit.
#mtnsync => 0,
# The path to your workspace (defaults to the srcdir itself)
@@ -72,8 +78,6 @@ use IkiWiki::Setup::Standard {
# # what you want.
# wrapper => "/svn/wikirepo/hooks/post-commit",
# wrappermode => "04755",
- # # Enable mail notifications of commits.
- # notify => 1,
# # Log to syslog since svn post-commit hooks
# # hide output and errors.
# syslog => 1,
@@ -84,16 +88,17 @@ use IkiWiki::Setup::Standard {
# # post-update hook script, which may not be
# # what you want.
# wrapper => "/git/wiki.git/hooks/post-update",
- # wrappermode => "04755",
- # # Enable mail notifications of commits.
- # notify => 1,
+ # wrappermode => "06755",
#},
],
- # Generate rss feeds for blogs?
- rss => 1,
- # Generate atom feeds for blogs?
- atom => 1,
+ # Default to generating rss feeds for blogs?
+ #rss => 1,
+ # Default to generating atom feeds for blogs?
+ #atom => 1,
+ # Allow generating feeds even if not generated by default?
+ #allowrss => 1,
+ #allowatom => 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?
@@ -118,13 +123,18 @@ use IkiWiki::Setup::Standard {
#usedirs => 0,
# Simple spam prevention: require an account-creation password.
#account_creation_password => "example",
+ # Uncomment to force ikiwiki to run with a particular umask.
+ #umask => 022,
+ # Default settings for the recentchanges page.
+ #recentchangespage => "recentchanges",
+ #recentchangesnum => 100,
# To add plugins, list them here.
#add_plugins => [qw{goodstuff search wikitext camelcase
# htmltidy fortune sidebar map rst anonok}],
# If you want to disable any of the default plugins, list them here.
#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
- # To add a directory to the perl searh path, use this.
+ # To add a directory to the perl search path, use this.
#libdir => "/home/me/.ikiwiki/",
# For use with the tag plugin, make all tags be located under a