Cleaned up environment variables in prep for heroku

.gitignore

@@ -0,0 +1,2 @@
+node_modules
+

README

@@ -1,3 +1,15 @@
 A Collaborative Rdio Jukebox
 
-twtbox.com
+twtbox.com
+
+##Installation
+
+heroku create
+heroku addons:add redistogo:nano
+heroku config:add REDISTOGO_URL=redis://redistogo:password@redistogo.com:8000/
+heroku config:add HEROKU_URL=http://appname.herokuapp.com
+heroku config:add RDIO_API_KEY=xxx
+heroku config:add RDIO_API_SECRET=xxx
+heroku config:add SESSION_SECRET=random_secret_string
+git push heroku master
+heroku open

app.js

@@ -1,46 +1,56 @@
+// Description:
+//   None
+//
+// Configuration:
+//   REDISTOGO_URL
+//   HEROKU_URL
+//   RDIO_API_KEY
+//   RDIO_API_SECRET
+//   SESSION_SECRET
+//   
+
 var express = require('express');
 var sys = require('sys');
 var io = require('socket.io');
 var mixpanel = require('mixpanel');
 var _ = require('underscore');
-var RedisStore = require('./my-connect-redis');
+var RedisStore = require('connect-redis')(express);
 
 var app = module.exports = express.createServer(express.logger());
 
-var domain, mp_client, redisHost, redisPort, redisPass;
-app.configure('development', function(){
-  redisHost = "filefish.redistogo.com";
-  redisPort = 9734;
-  redisPass = ""; // TODO: add the redis config. Removed for security
-  domain = "http://localhost:3000";
+var domain, mp_client, hostname, rclient;
+
+var Redis = require('redis');
+var Url = require('url');
+
+app.configure(function(){
+  info = Url.parse(process.env.REDISTOGO_URL || 'redis://localhost:6379');
+  rclient = Redis.createClient(info.port, info.hostname);
+  if(info.auth) {
+    rclient.auth(info.auth.split(":")[1]);
+  }
+  domain = process.env.HEROKU_URL || "http://localhost:3000";
+  hostname = Url.parse(domain).hostname;
+});
+
+app.configure('development', function(){  
   mp_client = new mixpanel.Client("8c587841d6590b8d46ca00197d8339a0");
   app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
 });
 
 app.configure('production', function(){
-  redisHost = "carp.redistogo.com";
-  redisPort = 9069;
-  redisPass = ""; // TODO: add the redis config. Removed for security
-  domain = "http://twtbox.com";
   mp_client = new mixpanel.Client("f5b01baad731fa1f37a2fd7be9a1de44");
   app.use(express.errorHandler()); 
 });
 
-var redis = require('redis');
-var rclient = redis.createClient(redisPort, redisHost);
-var dbAuth = function() { rclient.auth(redisPass); }
-rclient.addListener('connected', dbAuth);
-rclient.addListener('reconnected', dbAuth);
-dbAuth();
-
 app.configure(function(){
   app.set('views', __dirname + '/views');
   app.set('view engine', 'jade');
   app.use(express.bodyParser());
   app.use(express.methodOverride());
   app.use(express.compiler({ src: __dirname + '/public', enable: ['less'] }));
   app.use(express.cookieParser());
-  app.use(express.session({ store: new RedisStore({port: redisPort, host: redisHost, password: redisPass}), secret: '' })); // TODO: Add secret, removed for security
+  app.use(express.session({ store: new RedisStore({client: rclient}), secret: process.env.SESSION_SECRET }));
   app.use(app.router);
   app.use(express.static(__dirname + '/public'));
 });
@@ -52,7 +62,7 @@ app.dynamicHelpers({
 var socket = io.listen(app);
 var OAuth = require('./oauth').OAuth;
 var oa = new OAuth("http://api.rdio.com/oauth/request_token", "http://api.rdio.com/oauth/access_token",
-                  "", "", // TODO: Add the rdio oauth tokens. Removed for security
+                  process.env.RDIO_API_KEY, process.env.RDIO_API_SECRET,
                   "1.0", domain + "/callback", "HMAC-SHA1");                  
 var rdioEndpoint = "http://api.rdio.com/1/";
 
@@ -148,7 +158,7 @@ app.get("/topsongs.json", adminRequired, function(req, res, next) {
 // admin view of room
 app.get('/r/:room', adminRequired, function(req, res, next) {
   oa.post(rdioEndpoint, req.session.oauth_access_token, req.session.oauth_access_token_secret, 
-    { "method" : "getPlaybackToken", "domain" : "twtbox.com" }, function (error, data) {
+    { "method" : "getPlaybackToken", "domain" : hostname }, function (error, data) {
     var playbackToken = domain == "http://localhost:3000" ? "GAlNi78J_____zlyYWs5ZG02N2pkaHlhcWsyOWJtYjkyN2xvY2FsaG9zdEbwl7EHvbylWSWFWYMZwfc=" : JSON.parse(data)["result"];    
 
     var renderRoom = function(res, song, offset, playbackToken, domain) {

package.json

@@ -16,6 +16,7 @@
     "redis":"0.5.7",
     "socket.io":"0.9.0",
     "mixpanel":"0.0.3",
-    "underscore":"1.1.6"
+    "underscore":"1.1.6",
+    "connect-redis":"1.4.0"
   }
 }