From f894eae34f08658d89b12894602013062a8aab98 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 22 Apr 2013 15:03:07 -0400
Subject: [PATCH 1/3] tweaks

---
 src/templates.js | 2 --
 src/webserver.js | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/templates.js b/src/templates.js
index 1cb31a6e5d..a6fb101ffc 100644
--- a/src/templates.js
+++ b/src/templates.js
@@ -7,10 +7,8 @@ var fs = require('fs');
 	function loadTemplates(templatesToLoad) {
 		for (var t in templatesToLoad) {
 			(function(template) {
-				console.log(global.configuration.ROOT_DIRECTORY);
 				fs.readFile(global.configuration.ROOT_DIRECTORY + '/public/templates/' + template + '.tpl', function(err, html) {
 					global.templates[template] = html;
-					console.log(html);
 				});
 			}(templatesToLoad[t]));
 		}
diff --git a/src/webserver.js b/src/webserver.js
index 9c1c3a0c37..b7faee3544 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -5,6 +5,7 @@ var express = require('express'),
 
 (function(app) {
 	var templates = global.templates;
+	global.app = app;
 
 	app.get('/test', function(req, res) {
 		var body = 'testing';

From d035307d8b97939f3e8c29964d7eb1d099919f69 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 22 Apr 2013 15:17:41 -0400
Subject: [PATCH 2/3] changing the way the express app is instantiated

---
 public/templates/header.tpl |  2 +-
 src/webserver.js            | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 2dcfd5f10f..2bc5e24eb3 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -113,7 +113,7 @@
       }
 	</style>
 	<script>
-	var socket = io.connect('http://198.199.80.41:8081');
+	var socket = io.connect('http://198.58.101.18:8081');
 
 	socket.on('event:connect', function(data) {
 		
diff --git a/src/webserver.js b/src/webserver.js
index 371f5acc70..674fd98a29 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -1,11 +1,11 @@
 var express = require('express'),
+	WebServer = express(),
+	server = require('http').createServer(WebServer),
     connect = require('connect'),
-    config = require('../config.js'),
-    WebServer = express();
+    config = require('../config.js');
 
 (function(app) {
 	var templates = global.templates;
-	global.app = app;
 
 	app.get('/test', function(req, res) {
 		var body = 'testing';
@@ -39,8 +39,8 @@ var express = require('express'),
 			app.use(express.static(global.configuration.ROOT_DIRECTORY + '/public')); 
 			app.set('mailOptions', config.mailer);
 		});
-		
-		app.listen(config.port);
 	}
 
 }(WebServer));
+
+server.listen(config.port);

From 2d8725d522770c535e382ec9f81ded14cb349135 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 22 Apr 2013 15:23:02 -0400
Subject: [PATCH 3/3] changing socket.io to exist on the same port as the
 server, made config file template (removed config file from repo)

---
 .gitignore                 | 15 ++++++++-------
 public/config.default.json |  6 ++++++
 public/config.json         |  6 ------
 src/webserver.js           |  1 +
 src/websockets.js          |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 public/config.default.json
 delete mode 100644 public/config.json

diff --git a/.gitignore b/.gitignore
index dac9b9918d..81ff636051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-#################  
-## npm
-#################
-
-npm-debug.log
-node_modules/
-sftp-config.json
+#################  
+## npm
+#################
+
+npm-debug.log
+node_modules/
+sftp-config.json
+public/config.json
diff --git a/public/config.default.json b/public/config.default.json
new file mode 100644
index 0000000000..b81885cda2
--- /dev/null
+++ b/public/config.default.json
@@ -0,0 +1,6 @@
+{
+	"socket" : {
+		"address" : "localhost",
+		"port" : "4567"
+	}
+}
\ No newline at end of file
diff --git a/public/config.json b/public/config.json
deleted file mode 100644
index e8f8030db9..0000000000
--- a/public/config.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"socket" : {
-		"address" : "198.199.80.41",
-		"port" : "8081"
-	}
-}
\ No newline at end of file
diff --git a/src/webserver.js b/src/webserver.js
index 674fd98a29..dbbb65ff4f 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -44,3 +44,4 @@ var express = require('express'),
 }(WebServer));
 
 server.listen(config.port);
+global.server = server;
\ No newline at end of file
diff --git a/src/websockets.js b/src/websockets.js
index 6ed57f6edc..521f76702c 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -1,5 +1,5 @@
 
-var SocketIO = require('socket.io').listen(8081);
+var SocketIO = require('socket.io').listen(global.server);
 
 
 (function(io) {