From 9f5c49eaf1abbaae2065f64e372b4291d4fc6799 Mon Sep 17 00:00:00 2001 From: Joe Rayhawk Date: Thu, 8 Dec 2011 23:01:14 -0800 Subject: libpiny: Clarifying default ikiwiki setup file --- libpiny/share/ikiwiki.setup | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) (limited to 'libpiny/share') diff --git a/libpiny/share/ikiwiki.setup b/libpiny/share/ikiwiki.setup index 688a474..7f0fca0 100644 --- a/libpiny/share/ikiwiki.setup +++ b/libpiny/share/ikiwiki.setup @@ -1,19 +1,19 @@ #!/usr/bin/perl -# Configuration file for ikiwiki. -# 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. +# Base template for Ikiwiki configuration +# Overrides can be added globally to /etc/ikiwiki/piny.setup.pl and +# individually to /etc/ikiwiki/piny/name-of-repository.setup.pl at which point +# rebuildrepo will include them in future setup files. use IkiWiki::Setup::Standard { - # wikiname => "', # OVERWRITTEN BY PINY - # adminemail => "', # OVERWRITTEN BY PINY - # srcdir => "', # OVERWRITTEN BY PINY - # destdir => "', # OVERWRITTEN BY PINY - # url => "', # OVERWRITTEN BY PINY - # cgiurl => "', # OVERWRITTEN BY PINY - # historyurl => "', # OVERWRITTEN BY PINY - # diffurl => "', # OVERWRITTEN BY PINY + # wikiname => "", # OVERWRITTEN BY PINY + # adminemail => "", # OVERWRITTEN BY PINY + # srcdir => "", # OVERWRITTEN BY PINY + # destdir => "", # OVERWRITTEN BY PINY + # url => "", # OVERWRITTEN BY PINY + # cgiurl => "", # OVERWRITTEN BY PINY + # historyurl => "", # OVERWRITTEN BY PINY + # diffurl => "", # OVERWRITTEN BY PINY + # wrappers => [ ], # OVERWRITTEN BY PINY templatedir => "/srv/templates", # TODO: user-customizable templates underlaydir => "/usr/share/ikiwiki/basewiki", @@ -22,8 +22,6 @@ use IkiWiki::Setup::Standard { gitorigin_branch => "origin", gitmaster_branch => "master", - # wrappers => [ ], controlled by piny - # Generate rss feeds for blogs? rss => 1, # Generate atom feeds for blogs? -- cgit v1.2.3