urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amazon_s3: Fix to support the EU S3 datacenter, which is more picky about attempts to create already existing buckets.

master
Joey Hess 2010-02-09 16:24:14 -05:00
parent 4ce14aa621
commit a4ec579d1a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/amazon_s3.pm
View File

@ -132,6 +132,10 @@ sub getbucket {
}); });
} }
if (! $bucket) {
# Try to use existing bucket.
$bucket=$s3->bucket($config{amazon_s3_bucket});
}
if (! $bucket) { if (! $bucket) {
error(gettext("Failed to create S3 bucket: "). error(gettext("Failed to create S3 bucket: ").
$s3->err.": ".$s3->errstr."\n"); $s3->err.": ".$s3->errstr."\n");
@ -178,7 +182,7 @@ sub writefile ($$$;$$) {
# First, write the file to disk. # First, write the file to disk.
my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer); my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer);
my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file"); my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file");
# Store the data in S3. # Store the data in S3.

2
debian/changelog vendored
View File

@ -13,6 +13,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
* auto-blog.setup: Lock all pages, so only admin can post to the blog * auto-blog.setup: Lock all pages, so only admin can post to the blog
by default, and enable opendiscussion so others can comment. by default, and enable opendiscussion so others can comment.
* Fix color and format plugins to appear in the websetup interface. * Fix color and format plugins to appear in the websetup interface.
* amazon_s3: Fix to support the EU S3 datacenter, which is more picky
about attempts to create already existing buckets.
-- Joey Hess <joeyh@debian.org> Tue, 26 Jan 2010 22:25:33 -0500 -- Joey Hess <joeyh@debian.org> Tue, 26 Jan 2010 22:25:33 -0500