Merge branch 'master' of github.com:panoplymedia/audiogram

.gitignore

@@ -7,3 +7,4 @@ junk/
 media/
 *.log
 .jobs
+package-lock.json

INSTALL.md

@@ -133,6 +133,10 @@ Now you can run Audiogram in a container using that image:
 docker run -p 8888:8888 -t -i audiogram
 ```
 
+## AWS installation
+
+If you're trying to run Audiogram on AWS services like Lambda or Elastic Beanstalk that rely on the Amazon Linux distribution, you will probably need to follow the [node-canvas Amazon Linux AMI instructions](https://github.com/Automattic/node-canvas/wiki/Installation---Amazon-Linux-AMI-(EC2)) to install the dependencies and/or package up the resulting binaries.
+
 ## Mac troubleshooting
 
 If things aren't working on a Mac, there are a few fixes you can try.

package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "aws-sdk": "^2.2.39",
     "browserify": "^13.0.0",
-    "canvas": "^1.6.5",
+    "canvas": "git+https://github.com/chearon/node-canvas.git#12971f64a66b",
     "compression": "^1.6.1",
     "d3": "4.10.0",
     "dotenv": "^2.0.0",
@@ -35,11 +35,11 @@
     "morgan": "^1.7.0",
     "multer": "^1.1.0",
     "node-ffprobe": "^1.2.2",
-    "node-uuid": "^1.4.7",
     "redis": "^2.4.2",
     "rimraf": "^2.5.0",
     "smartquotes": "^1.0.0",
     "underscore": "^1.8.3",
+    "uuid": "^3.0.1",
     "webaudio-peaks": "0.0.5",
     "winston": "^2.2.0"
   },

server/index.js

@@ -3,7 +3,7 @@ var express = require("express"),
     compression = require("compression"),
     path = require("path"),
     multer = require("multer"),
-    uuid = require("node-uuid"),
+    uuid = require("uuid"),
     mkdirp = require("mkdirp");
 
 // Routes and middleware