diff --git a/.gitignore b/.gitignore index 84ded35..b1377f2 100644 Binary files a/.gitignore and b/.gitignore differ diff --git a/config/auth.js b/config/auth.js index 03a0690..3fc1901 100644 --- a/config/auth.js +++ b/config/auth.js @@ -6,19 +6,19 @@ module.exports = { 'facebookAuth' : { 'clientID' : '1388988078028764', // your App ID 'clientSecret' : process.env.FACEBOOK_SECRET, // your App Secret - 'callbackURL' : 'http://localhost:' + (process.env.PORT || 8080) + '/auth/facebook/callback' + 'callbackURL' : process.env.FACEBOOK_CALLBACK || 'http://localhost:' + (process.env.PORT || 8080) + '/auth/facebook/callback' }, 'twitterAuth' : { 'consumerKey' : '0P6wn4IB9MQSSt5eaF3eDxj1v', 'consumerSecret' : process.env.TWITTER_SECRET, - 'callbackURL' : 'http://localhost:' + (process.env.PORT || 8080) + '/auth/twitter/callback' + 'callbackURL' : process.env.TWITTER_CALLBACK || 'http://localhost:' + (process.env.PORT || 8080) + '/auth/twitter/callback' }, 'googleAuth' : { 'clientID' : '859053446273-1e5ln4ca5gco80tl88a0kefj35id3eik.apps.googleusercontent.com', 'clientSecret' : process.env.GOOGLE_SECRET, - 'callbackURL' : 'http://localhost:' + (process.env.PORT || 8080) + '/auth/google/callback' + 'callbackURL' : process.env.GOOGLE_CALLBACK || 'http://localhost:' + (process.env.PORT || 8080) + '/auth/google/callback' } }; \ No newline at end of file diff --git a/config/c9.js b/config/c9.js new file mode 100644 index 0000000..17003b5 --- /dev/null +++ b/config/c9.js @@ -0,0 +1,11 @@ +var argv = require('yargs').argv; + +process.env.FACEBOOK_SECRET = argv.FACEBOOK_SECRET; +process.env.TWITTER_SECRET = argv.TWITTER_SECRET; +process.env.GOOGLE_SECRET = argv.GOOGLE_SECRET; + +process.env.FACEBOOK_CALLBACK = 'https://concarneau-c9-btouellette.c9.io/auth/facebook/callback'; +process.env.TWITTER_CALLBACK = 'https://concarneau-c9-btouellette.c9.io/auth/twitter/callback'; +process.env.GOOGLE_CALLBACK = 'https://concarneau-c9-btouellette.c9.io/auth/google/callback'; + +process.env.MONGOLAB_URI = 'mongodb://' + process.env.IP + '/concarneau_db'; \ No newline at end of file diff --git a/config/database.js b/config/database.js index d415680..a1f1a95 100644 --- a/config/database.js +++ b/config/database.js @@ -1,6 +1,4 @@ // config/database.js module.exports = { - - 'url' : process.env.MONGOLAB_URI || 'mongodb://localhost/concarneau_db' // looks like mongodb://:@mongo.onmodulus.net:27017/Mikha4ot - + 'url' : process.env.MONGOLAB_URI || 'mongodb://localhost/concarneau_db' }; \ No newline at end of file diff --git a/mongod_c9 b/mongod_c9 new file mode 100755 index 0000000..cee4bf6 --- /dev/null +++ b/mongod_c9 @@ -0,0 +1 @@ +mongod --bind_ip=$IP --dbpath=data --nojournal --rest "$@" diff --git a/package.json b/package.json index d3742f4..ea46501 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "connect-flash": "~0.1.1", "bcrypt-nodejs": "latest", "tunnel": "0.0.3", - "socket.io": "^0.9.16" + "socket.io": "^0.9.16", + "yargs": "~1.2.1" } } diff --git a/server.js b/server.js index c3fd04a..8f2acd3 100644 --- a/server.js +++ b/server.js @@ -9,6 +9,11 @@ if(process.env.HTTP_PROXY) { require('./config/proxy.js')(host, port); } +// if this is a c9 project configure appropriately +if(process.env.C9_PROJECT) { + require('./config/c9.js'); +} + // get all the tools we need var express = require('express'); var app = express();