]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Plugin/amazon_s3.pm
add section information
[ikiwiki.git] / IkiWiki / Plugin / amazon_s3.pm
index 10bf358e44a69148954fc36a0557330016fa4024..f2f4dbcf20f88572469ecaafbe2dd1e43ba974b1 100644 (file)
@@ -45,6 +45,7 @@ sub getsetup () {
                plugin => {
                        safe => 0,
                        rebuild => 0,
+                       section => "special-purpose",
                },
                amazon_s3_key_id => {
                        type => "string",
@@ -133,7 +134,11 @@ sub getbucket {
        }
 
        if (! $bucket) {
-               error(gettext("Failed to create bucket in S3: ").
+               # Try to use existing bucket.
+               $bucket=$s3->bucket($config{amazon_s3_bucket});
+       }
+       if (! $bucket) {
+               error(gettext("Failed to create S3 bucket: ").
                        $s3->err.": ".$s3->errstr."\n");
        }
 
@@ -178,7 +183,7 @@ sub writefile ($$$;$$) {
 
        # First, write the file to disk.
        my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer);
-               
+
        my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file");
 
        # Store the data in S3.