Merge commit 'upstream/master' into pub/master

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

diff --git a/docwiki.setup b/docwiki.setup
index bbe2d438adcfd80a7c1445bcfba632724045810b..6d732fd6b1d59818687a930342b9b02a123e99f5 100644 (file)
--- a/docwiki.setup
+++ b/docwiki.setup
@@ -7,16 +7,13 @@ use IkiWiki::Setup::Standard {
        destdir => "html",
        templatedir => "templates",
        underlaydir => "underlays/basewiki",
        destdir => "html",
        templatedir => "templates",
        underlaydir => "underlays/basewiki",

-       wrappers => [],

        discussion => 0,
        discussion => 0,

-       exclude => qr/\/discussion/,
+       exclude => qr/\/discussion|bugs\/*|todo\/*/,

        locale => '',
        verbose => 1,
        syslog => 0,
        userdir => "users",
        usedirs => 0,
        locale => '',
        verbose => 1,
        syslog => 0,
        userdir => "users",
        usedirs => 0,

-       add_plugins => [qw{goodstuff version polygen fortune amazon_s3}],
-       amazon_s3_key_id => '08TJMT99S3510QHZEP82',
-       amazon_s3_bucket => 'ikiwiki-test',
-       amazon_s3_key_file => "/home/joey/.hide/aws_secret_access_key",
+       prefix_directives => 1,
+       add_plugins => [qw{goodstuff version haiku polygen fortune}],

 }
 }