Merge branch 'master' into pedigree

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

diff --git a/docwiki.setup b/docwiki.setup
index 5793d87bf7f3f53d6b9b3cb67cd6e97e0301b54f..ba3dd680d409d8afcf9e0e4019e618e6884acde2 100644 (file)
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -9,16 +9,11 @@ use IkiWiki::Setup::Standard {
        underlaydir => "underlays/basewiki",
        wrappers => [],
        discussion => 0,
-       exclude => qr/\/discussion/,
+       exclude => qr/\/discussion|bugs\/*|todo\/*/,
        locale => '',
        verbose => 1,
        syslog => 0,
        userdir => "users",
        usedirs => 0,
-       rcs => 'git',
-       rss => 1,
-       cgiurl => "http://ikiwiki.info/ikiwiki.cgi",
-       url => "http://ikiwiki.info",
-       add_plugins => [qw{goodstuff version haiku polygen fortune
-               recentchanges }],
+       add_plugins => [qw{goodstuff version haiku polygen fortune}],
 }