Skip to content

Commit

Permalink
v1.7.15
Browse files Browse the repository at this point in the history
 - Use `aws-sdk` NPM package instead of `knox` for uploads to AWS:S3
 - Meteor update
 - Node.js and npm update
 - Dependencies update
 - Overall codebase enhancements
  • Loading branch information
dr-dimitru committed May 19, 2017
1 parent 231dc17 commit c83e96e
Show file tree
Hide file tree
Showing 5,121 changed files with 797,156 additions and 184,425 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .node_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v4.7.3
v4.8.2
31 changes: 31 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Copyright (c) 2017, dr.dimitru (Dmitriy A.; Veliov Group, LLC)
All rights reserved.

Redistribution and use in source and binary forms,
with or without modification, are permitted provided
that the following conditions are met:

1. Redistributions of source code must retain the
above copyright notice, this list of conditions
and the following disclaimer.

2. Redistributions in binary form must reproduce the
above copyright notice, this list of conditions and
the following disclaimer in the documentation and/or
other materials provided with the distribution.

3. Neither the name of the copyright holder nor the
names of its contributors may be used to endorse or
promote products derived from this software without
specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35 changes: 24 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,17 @@ Activate AWS:S3
======
1. Read [this article](https://github.com/VeliovGroup/Meteor-Files/wiki/AWS-S3-Integration)
2. After creating S3 bucket, create CloudFront Distribution and attach it to S3 bucket
3. Set S3 credentials into `METEOR_SETTINGS` env.var or pass as file, read [here for more info](http://docs.meteor.com/#/full/meteor_settings), alternatively (*if something not working*) set `S3` env.var
3. Set S3 credentials into `METEOR_SETTINGS` env.var or pass as the file, read [here for more info](http://docs.meteor.com/#/full/meteor_settings), alternatively (*if something not working*) set `S3` env.var
4. You can pass S3 credentials as JSON-string when using "*Heroku's one click install-button*"

S3 credentials format (*region and cfdomain is required*):
S3 credentials format (*region is required*):
```json
{
"s3": {
"key": "xxx",
"secret": "xxx",
"bucket": "xxx",
"region": "xxx",
"cfdomain": "https://xxx.cloudfront.net"
"region": "xxx"
}
}
```
Expand All @@ -53,7 +52,7 @@ DropBox credentials format:
}
```

Activate Social Logins
Activate login via Social Networks
======
All credentials is set via env.var(s), if you're using "*Heroku's one click install-button*" - you will be able to pass all of them.
- Facebook - [Create an App](https://developers.facebook.com/apps/):
Expand All @@ -71,15 +70,29 @@ All credentials is set via env.var(s), if you're using "*Heroku's one click inst

Deploy to Heroku
======
- Due to "*ephemeral filesystem*" on Heroku, we suggest to use DropBox/AWS:S3 as permanent storage, [read DropBox/S3/GridFS tutorial](https://github.com/VeliovGroup/Meteor-Files/wiki/Third-party-storage)
- Due to "*ephemeral filesystem*" on Heroku, we suggest to use 3rd-party permanent storage, [read DropBox/S3/GridFS tutorial](https://github.com/VeliovGroup/Meteor-Files/wiki/Third-party-storage)
- Go to [Heroku](https://signup.heroku.com/dc) create and confirm your new account
- Go though [Node.js Tutorial](https://devcenter.heroku.com/articles/getting-started-with-nodejs)
- Go through [Node.js Tutorial](https://devcenter.heroku.com/articles/getting-started-with-nodejs)
- Install [Heroku Toolbet](https://devcenter.heroku.com/articles/getting-started-with-nodejs#set-up)
- Then go to Terminal into Meteor's project directory and run:

```shell
git clone https://github.com/VeliovGroup/Meteor-Files-Demo.git
cd Meteor-Files-Demo
# Build an app ypourself, or use pre-build version: https://github.com/VeliovGroup/Meteor-Files-Demo
# Available architectures:
# os.osx.x86_64
# os.linux.x86_64
# os.linux.x86_32
# os.windows.x86_32
meteor build ../build-<your-app-name> --architecture os.linux.x86_64
cd ../build-<your-app-name>
tar xzf <name-of-archive> -C ./
cd bundle/
cp -Rf * ../
cd ../
rm -Rf bundle/
rm -Rf <name-of-archive>
touch Procfile
echo "web: node main.js" > Procfile

heroku create <your-app-name> --buildpack https://github.com/heroku/heroku-buildpack-nodejs
# This command will output something like:
Expand All @@ -103,7 +116,7 @@ heroku config:set MONGO_URL=mongodb://<dbuser>:<dbpassword>@dt754268.mlab.com:19
# heroku config:set DROPBOX='{"dropbox":{"key": "xxx", "secret": "xxx", "token": "xxx"}}'

# For AWS:S3:
# heroku config:set S3='{"s3":{"key": "xxx", "secret": "xxx", "bucket": "xxx", "region": "xxx", "cfdomain": "https://xxx.cloudfront.net"}}'
# heroku config:set S3='{"s3":{"key": "xxx", "secret": "xxx", "bucket": "xxx", "region": "xxx"}}'

# For Facebook:
# heroku config:set ACCOUNTS_FACEBOOK_ID=xxx ACCOUNTS_FACEBOOK_SEC=yyy
Expand All @@ -127,4 +140,4 @@ git push heroku master
- Go to `https://<your-app-name>.herokuapp.com`
- If your app has errors:
* Check logs: `heroku logs --tail`
* Try to run locally and debug: `heroku run node`
* Try to run locally and debug: `heroku run node`
44 changes: 22 additions & 22 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{
"name": "Meteor-Files-Demo",
"version": "1.7.12",
"description": "Upload files with speed on Meteor. Application build on top of ostrio:files package",
"version": "1.7.15",
"description": "Upload files with thes speed of Meteor. Application build on top of ostrio:files package",
"repository": "https://github.com/VeliovGroup/Meteor-Files-Demo",
"website": "https://github.com/VeliovGroup/Meteor-Files-Demo",
"logo": "https://raw.githubusercontent.com/VeliovGroup/Meteor-Files/master/logo.png",
"scripts": {
"start": "node main.js"
},
"dependencies": {
"async": "2.1.4",
"babel-runtime": "^6.22.0",
"connect": "^3.4.1",
"dropbox": "0.10.3",
"fibers": "1.0.15",
"fs-extra": "2.0.0",
"async": "^2.4.0",
"aws-sdk": "^2.53.0",
"babel-runtime": "^6.23.0",
"connect": "^3.6.2",
"dropbox": "^0.10.3",
"fibers": "^1.0.15",
"fs-extra": "^2.1.2",
"gm": "^1.23.0",
"http-proxy": "^1.13.2",
"keypress": "^0.2.1",
"knox": "^0.9.2",
"meteor-deque": "*",
"meteor-node-stubs": "~0.2.0",
"meteor-promise": "0.8.0",
"mime": "^1.3.4",
"mongodb": "^2.2.21",
"node-gyp": "3.5.0",
"node-pre-gyp": "0.6.32",
"meteor-node-stubs": "^0.2.5",
"meteor-promise": "^0.8.4",
"mime": "^1.3.6",
"mongodb": "^2.2.26",
"node-gyp": "^3.6.1",
"node-pre-gyp": "^0.6.34",
"progress": "^1.1.8",
"promise": "7.1.1",
"request": "2.79.0",
"semver": "5.3.0",
"request": "^2.81.0",
"semver": "^5.3.0",
"sockjs": "^0.3.16",
"source-map-support": "https://github.com/meteor/node-source-map-support/tarball/1912478769d76e5df4c365e147f25896aee6375e",
"stream-buffers": "^3.0.0",
"throttle": "1.0.3",
"underscore": "1.8.3",
"useragent": "^2.1.11"
"underscore": "^1.8.3",
"useragent": "^2.1.13"
},
"env": {
"ROOT_URL": {
Expand All @@ -51,7 +51,7 @@
"required": false
},
"AWS S3 Bucket": {
"description": "[Optional] AWS S3 Bucket credentials object, format: {\"s3\":{\"key\": \"xxx\", \"secret\": \"xxx\", \"bucket\": \"xxx\", \"region\": \"xxx\", \"cfdomain\": \"https://xxx.cloudfront.net\"}}",
"description": "[Optional] AWS S3 Bucket credentials object, format: {\"s3\":{\"key\": \"xxx\", \"secret\": \"xxx\", \"bucket\": \"xxx\", \"region\": \"xxx\"}}",
"required": false
},
"ACCOUNTS_METEOR_ID": {
Expand Down Expand Up @@ -106,7 +106,7 @@
}
],
"engines": {
"node": "4.7.3",
"npm": "4.1.2"
"node": "4.8.2",
"npm": "4.5.0"
}
}
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Meteor-Files",
"version": "1.7.12",
"description": "Upload files with speed on Meteor. Application build on top of ostrio:files package",
"version": "1.7.15",
"description": "Upload files with the speed of Meteor. Application build on top of ostrio:files package",
"main": "main.js",
"scripts": {
"preinstall": "cd ./programs/server && npm install",
Expand Down Expand Up @@ -30,36 +30,36 @@
},
"homepage": "https://github.com/VeliovGroup/Meteor-Files-Demo",
"dependencies": {
"async": "2.1.4",
"babel-runtime": "^6.22.0",
"connect": "^3.4.1",
"async": "^2.4.0",
"aws-sdk": "^2.54.0",
"babel-runtime": "^6.23.0",
"connect": "^3.6.2",
"dropbox": "^0.10.3",
"fibers": "1.0.15",
"fs-extra": "2.0.0",
"fibers": "^1.0.15",
"fs-extra": "^2.1.2",
"gm": "^1.23.0",
"http-proxy": "^1.13.2",
"keypress": "^0.2.1",
"knox": "^0.9.2",
"meteor-deque": "*",
"meteor-node-stubs": "~0.2.0",
"meteor-promise": "0.8.0",
"mime": "^1.3.4",
"mongodb": "^2.2.21",
"node-gyp": "3.5.0",
"node-pre-gyp": "0.6.32",
"meteor-node-stubs": "^0.2.5",
"meteor-promise": "^0.8.4",
"mime": "^1.3.6",
"mongodb": "^2.2.26",
"node-gyp": "^3.6.1",
"node-pre-gyp": "^0.6.34",
"progress": "^1.1.8",
"promise": "7.1.1",
"request": "^2.79.0",
"semver": "5.3.0",
"request": "^2.81.0",
"semver": "^5.3.0",
"sockjs": "^0.3.16",
"source-map-support": "https://github.com/meteor/node-source-map-support/tarball/1912478769d76e5df4c365e147f25896aee6375e",
"stream-buffers": "^3.0.0",
"throttle": "1.0.3",
"underscore": "1.8.3",
"useragent": "^2.1.11"
"underscore": "^1.8.3",
"useragent": "^2.1.13"
},
"engines": {
"node": "4.7.3",
"npm": "4.1.2"
"node": "4.8.2",
"npm": "4.5.0"
}
}
Loading

0 comments on commit c83e96e

Please sign in to comment.