getting things running again

2 files changed, 10 insertions, 9 deletions

diff --git a/server/lib/api/subscription.js b/server/lib/api/subscription.js
index c2fff4c..c1e2d33 100644
--- a/server/lib/api/subscription.js
+++ b/server/lib/api/subscription.js
@@ -8,9 +8,9 @@ var _ = require('lodash'),
 	Project = require('../schemas/Project'),
 	Layout = require('../schemas/Layout'),
 	Plan = require('../schemas/Plan');
-	Subscription = require('../schemas/Subscription'),
-	Recurly = require('node-recurly'),
-	recurly = new Recurly(require('../webhook/recurly-config'));
+	Subscription = require('../schemas/Subscription');
+//	Recurly = require('node-recurly'),
+//	recurly = new Recurly(require('../webhook/recurly-config'));
 
 var plan_levels = {
   free: 0,
@@ -203,4 +203,4 @@ var subscription = module.exports = {
     })
   },
 
-};
\ No newline at end of file
+};
diff --git a/server/lib/upload.js b/server/lib/upload.js
index f6e22da..ebb1249 100644
--- a/server/lib/upload.js
+++ b/server/lib/upload.js
@@ -5,9 +5,9 @@ var config = require('../../config.json'),
 	moment = require('moment');
 
 var s3 = module.exports.s3 = knox.createClient({
-	key: process.env.OKFOCUS_S3_KEY,
-	secret: process.env.OKFOCUS_S3_SECRET,
-	bucket: 'vvalls'
+	key: process.env.S3_KEY,
+	secret: process.env.S3_SECRET,
+	bucket: process.env.S3_BUCKET,
 });
 
 var acceptableuploadTypes = {
@@ -32,7 +32,7 @@ module.exports.put = function (key, file, opt) {
 							.substr(-128)
 				   + "." + extension;
 
-	var remote_path = "/images/" + key + "/" + ts + "/" + filename
+	var remote_path = "/vvalls/images/" + key + "/" + ts + "/" + filename
 
 	if (! extension) {
 		err = "unacceptable filetype"
@@ -59,7 +59,8 @@ module.exports.put = function (key, file, opt) {
 		'x-amz-acl': 'public-read'
 	}, function(err, s3res) {
 		if (err || s3res.statusCode !== 200) {
-			console.error(err);
+			console.log(s3res.statusCode)
+			console.error('s3 error:', err);
 			if (s3res && s3res.resume) {
 				s3res.resume()
 			}