X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b74b7ab68b983b3f7d9e561eb991b21764cdb3be..e163b037bf3c9fa68be0971752e6d6584f8d55fd:/IkiWiki/Plugin/amazon_s3.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index b7470ca79..597539c13 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -42,23 +42,26 @@ sub getopt () { #{{{
 
 sub getsetup () { #{{{
 	return
-		 amazon_s3_key_id => {
-			type => "boolean",
-			default => "",
+		plugin => {
+			safe => 0,
+			rebuild => 0,
+		},
+		amazon_s3_key_id => {
+			type => "string",
+			example => "XXXXXXXXXXXXXXXXXXXX",
 			description => "public access key id",
 			safe => 1,
 			rebuild => 0,
 		},
 		amazon_s3_key_id => {
 			type => "string",
-			default => "",
-			description => "file holding secret key",
+			example => "$ENV{HOME}/.s3_key",
+			description => "file holding secret key (must not be readable by others!)",
 			safe => 0, # ikiwiki reads this file
 			rebuild => 0,
 		},
 		amazon_s3_bucket => {
 			type => "string",
-			default => "",
 			example => "mywiki",
 			description => "globally unique name of bucket to store wiki in",
 			safe => 1,
@@ -66,14 +69,13 @@ sub getsetup () { #{{{
 		},
 		amazon_s3_prefix => {
 			type => "string",
-			default => "wiki/",
+			example => "wiki/",
 			description => "a prefix to prepend to each page name",
 			safe => 1,
 			rebuild => 1,
 		},
 		amazon_s3_location => {
 			type => "string",
-			default => "",
 			example => "EU",
 			description => "which S3 datacenter to use (leave blank for default)",
 			safe => 1,
@@ -81,8 +83,8 @@ sub getsetup () { #{{{
 		},
 		amazon_s3_dupindex => {
 			type => "boolean",
-			default => 0,
-			description => "store each index file twice, to allow urls ending in \"/index.html\" and \"/\"",
+			example => 0,
+			description => "store each index file twice? (allows urls ending in \"/index.html\" and \"/\")",
 			safe => 1,
 			rebuild => 1,
 		},