X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a50fb83394b11aa9d794fed7b471b27b66a553d3..0d7bc7402c9a5e922ee3eb1b093e689756b001ff:/IkiWiki/Plugin/amazon_s3.pm?ds=inline

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index e1ce4ae08..b7470ca79 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -17,7 +17,8 @@ BEGIN {
 };
 
 sub import { #{{{
-	hook(type => "getopt", id => "aggregate", call => \&getopt);
+	hook(type => "getopt", id => "amazon_s3", call => \&getopt);
+	hook(type => "getsetup", id => "amazon_s3", call => \&getsetup);
 	hook(type => "checkconfig", id => "amazon_s3", call => \&checkconfig);
 } # }}}
 
@@ -39,6 +40,54 @@ sub getopt () { #{{{
 	});
 } #}}}
 
+sub getsetup () { #{{{
+	return
+		 amazon_s3_key_id => {
+			type => "boolean",
+			default => "",
+			description => "public access key id",
+			safe => 1,
+			rebuild => 0,
+		},
+		amazon_s3_key_id => {
+			type => "string",
+			default => "",
+			description => "file holding secret key",
+			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,
+			rebuild => 1,
+		},
+		amazon_s3_prefix => {
+			type => "string",
+			default => "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,
+			rebuild => 1,
+		},
+		amazon_s3_dupindex => {
+			type => "boolean",
+			default => 0,
+			description => "store each index file twice, to allow urls ending in \"/index.html\" and \"/\"",
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
 sub checkconfig { #{{{
 	foreach my $field (qw{amazon_s3_key_id amazon_s3_key_file
 	                      amazon_s3_bucket}) {