diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/index.js | 11 | ||||
| -rw-r--r-- | server/lib/api/subscription.js | 8 | ||||
| -rw-r--r-- | server/lib/upload.js | 11 |
3 files changed, 17 insertions, 13 deletions
diff --git a/server/index.js b/server/index.js index 224aa86..ccc1c26 100644 --- a/server/index.js +++ b/server/index.js @@ -1,4 +1,6 @@ /* jshint node: true */ +require('dotenv').config(); + var ejs = require('ejs'); ejs.open = '[['; ejs.close = ']]'; @@ -37,7 +39,7 @@ site.ready = function(){ } site.setup = function(){ - var SessionStore = new MongoStore({ mongoose_connection: mongoose.connection }) + // var SessionStore = new MongoStore({ mongoose_connection: mongoose.connection }) // auth.initBasicAuth(app) app.set('port', config.port); @@ -52,15 +54,16 @@ site.setup = function(){ key: 'vvalls.sid', secret: 'flibbertigibbet', cookie: { domain: '.' + config.hostName, maxAge: 43200000000 }, - store: SessionStore + // store: SessionStore })); app.use(bodyParser()); app.use(multer()); + app.use(passport.initialize()); + app.use(passport.session()); app.use(express.query()); app.use(express.csrf()); app.use(express.methodOverride()); - app.use(passport.initialize()); - app.use(passport.session()); + app.use(app.router); app.set('trust proxy', true) app.set('env', config.env.production ? "production" : "development") 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() } |