YunxiaoXu/hexo-deployer-s3-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from thewillhuang/master

Browse Source 
use default amazon env variables
This commit is contained in:
Nicholas Terwoord
2016-12-13 23:48:00 -05:00
committed by GitHub
parent d50a2e75c3 2409341605
commit 4899912ab1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -1,4 +1,4 @@
# hexo-deployer-s3
# hexo-deployer-s3
Amazon S3 deployer plugin for [Hexo](http://hexo.io/)
@@ -17,8 +17,8 @@ You can configure this plugin in `_config.yml`.
deploy:
type: s3
bucket: <S3 bucket>
aws_key: <AWS id key> // Optional, if the environment variable `AWS_KEY` is set
aws_secret: <AWS secret key> // Optional, if the environment variable `AWS_SECRET` is set
aws_key: <AWS id key> // Optional, if the environment variable `AWS_ACCESS_KEY_ID` is set
aws_secret: <AWS secret key> // Optional, if the environment variable `AWS_SECRET_ACCESS_KEY` is set
concurrency: <number of connections> // Optional
region: <region> // Optional, see https://github.com/LearnBoost/knox#region
```

8
lib/deployer.js
View File

@@ -6,8 +6,8 @@ module.exports = function(args) {
var config = {
maxAsyncS3: args.concurrency,
s3Options: {
accessKeyId: args.aws_key || process.env.AWS_KEY,
secretAccessKey: args.aws_secret || process.env.AWS_SECRET,
accessKeyId: args.aws_key || process.env.AWS_ACCESS_KEY_ID || process.env.AWS_KEY,
secretAccessKey: args.aws_secret || process.env.AWS_SECRET_ACCESS_KEY || process.env.AWS_SECRET,
region: args.region
}
};
@@ -44,7 +44,7 @@ module.exports = function(args) {
var uploader = client.uploadDir(params);
log.info('Uploading...');
return uploader
.on('progress', function() {
// log.info(uploader.progressAmount + ' / ' + uploader.progressTotal);
@@ -53,4 +53,4 @@ module.exports = function(args) {
}).on('error', function(err) {
log.error(err)
});
};
};