Pass along region information

This PR allows someone to define a `region` key in `_config.yml` so that upload works correctly via `s3-sync`.

Why? [`s3-sync`](https://github.com/hughsk/s3-sync) uses [`knox`](https://github.com/LearnBoost/knox) to handle S3 commands. Unless your are uploading to `us-standard`, the upload will fail because the S3 url won't be correct.
This commit is contained in:
Nicholas Terwoord
2014-09-01 19:47:54 -04:00
parent 11305cda14
commit 74e7a6e5c1
2 changed files with 4 additions and 1 deletions

View File

@@ -30,6 +30,7 @@ deploy:
aws_key: <AWS id key> aws_key: <AWS id key>
aws_secret: <AWS secret key> aws_secret: <AWS secret key>
concurrency: <number of connections> //Optional concurrency: <number of connections> //Optional
region: <region> //Optional, see https://github.com/LearnBoost/knox#region
``` ```
### Disable ### Disable
@@ -57,4 +58,4 @@ Execute the following command. Don't forget to disable the plugin before uninsta
npm uninstall hexo-deployer-s3 npm uninstall hexo-deployer-s3
``` ```
[Hexo]: http://zespia.tw/hexo [Hexo]: http://zespia.tw/hexo

View File

@@ -21,6 +21,7 @@ hexo.extend.deployer.register('s3', function (args, callback) {
' aws_key: <aws_key>', ' aws_key: <aws_key>',
' aws_secret: <aws_secret>', ' aws_secret: <aws_secret>',
' [concurrency]: <concurrency>', ' [concurrency]: <concurrency>',
' [region]: <region> # See https://github.com/LearnBoost/knox#region',
'', '',
'For more help, you can check the docs: ' + 'https://github.com/joshstrange/hexo-deployer-s3' 'For more help, you can check the docs: ' + 'https://github.com/joshstrange/hexo-deployer-s3'
]; ];
@@ -47,6 +48,7 @@ hexo.extend.deployer.register('s3', function (args, callback) {
, secret: config.aws_secret , secret: config.aws_secret
, bucket: config.bucket , bucket: config.bucket
, concurrency: config.concurrency , concurrency: config.concurrency
, region: config.region
}).on('data', function(file) { }).on('data', function(file) {
console.log(file.fullPath + ' -> ' + file.url) console.log(file.fullPath + ' -> ' + file.url)
}).on('end', function() { }).on('end', function() {