From 8d574399e5ffec4df40afb40f090737e40c98163 Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Thu, 1 Oct 2015 09:50:00 -0400
Subject: [PATCH] Use environment for proxy settings

Also use default local scratchr2 port, 8080.
---
 .env.sample         |  2 ++
 server/index.js     | 15 ++++++++++-----
 server/proxies.json |  1 -
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 .env.sample

diff --git a/.env.sample b/.env.sample
new file mode 100644
index 000000000..453bccb55
--- /dev/null
+++ b/.env.sample
@@ -0,0 +1,2 @@
+PROXY_HOST=http://localhost
+PROXY_PORT=8080
diff --git a/server/index.js b/server/index.js
index 370c35ad5..c5170eca9 100644
--- a/server/index.js
+++ b/server/index.js
@@ -14,8 +14,8 @@ app.use(log());
 app.use(compression());
 
 // Bind routes
-for (var rId in routes) {
-    var route = routes[rId];
+for (var routeId in routes) {
+    var route = routes[routeId];
     if ( route.static ) {
         app.use( express.static( eval( route.resolve ), route.attributes ) );
     } else {
@@ -27,9 +27,11 @@ for (var rId in routes) {
 if ( process.env.ENVIRONMENT == 'development' ) {
     var proxies = require('./proxies.json');
     var url = require('url');
-    for (var pId in proxies) {
-        var proxyRoute = proxies[pId];
-        app.use(proxyRoute.root, proxy(proxyRoute.proxy, {
+    var proxyHost = process.env.PROXY_HOST || 'http://localhost';
+    proxyHost += ':' + (process.env.PROXY_PORT || 8080);
+    for (var proxyId in proxies) {
+        var proxyRoute = proxies[proxyId];
+        app.use(proxyRoute.root, proxy(proxyRoute.proxy || proxyHost, {
             filter: function (req) {
                 return proxyRoute.paths.indexOf(url.parse(req.url).path) > -1;
             },
@@ -44,4 +46,7 @@ if ( process.env.ENVIRONMENT == 'development' ) {
 var port = process.env.PORT || 8333;
 app.listen(port, function () {
     process.stdout.write('Server listening on port ' + port + '\n');
+    if (proxyHost) {
+        process.stdout.write('Proxy host: ' + proxyHost + '\n');
+    }
 });
diff --git a/server/proxies.json b/server/proxies.json
index 4a460d940..e216b393e 100644
--- a/server/proxies.json
+++ b/server/proxies.json
@@ -1,6 +1,5 @@
 [
     {
-        "proxy": "http://localhost:8000",
         "root": "/",
         "paths": [
             "/session/",