Merge commit 'upstream/master'

[git.ikiwiki.info.git] / IkiWiki / Plugin / amazon_s3.pm

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index d9279b6800d5df0ea594543f48daf10b0699c5f9..597539c13b0f2c218955dc81da2f26dfb7aa6fb4 100644 (file)
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -42,7 +42,11 @@ sub getopt () { #{{{
 
 sub getsetup () { #{{{
        return
-                amazon_s3_key_id => {
+               plugin => {
+                       safe => 0,
+                       rebuild => 0,
+               },
+               amazon_s3_key_id => {
                        type => "string",
                        example => "XXXXXXXXXXXXXXXXXXXX",
                        description => "public access key id",
@@ -79,7 +83,7 @@ sub getsetup () { #{{{
                },
                amazon_s3_dupindex => {
                        type => "boolean",
-                       default => 0,
+                       example => 0,
                        description => "store each index file twice? (allows urls ending in \"/index.html\" and \"/\")",
                        safe => 1,
                        rebuild => 1,