Merge branch 'brysgo-master'

src/server.js

@@ -5,11 +5,13 @@ import Transmit from "react-transmit";
 import routes from "views/Routes";
 import url from "url";
 
+var hostname = process.env.HOSTNAME || "localhost";
+
 /**
  * Start Hapi server on port 8000.
  */
 const server = new Server();
-server.connection({port: process.env.PORT || 8000});
+server.connection({host: hostname, port: process.env.PORT || 8000});
 server.start(function () {
 	console.info("==> ✅  Server is listening");
 	console.info("==> 🌎  Go to " + server.info.uri.toLowerCase());
@@ -71,7 +73,7 @@ server.ext("onPreResponse", (request, reply) => {
 				</html>`
 			);
 
-			const webserver = process.env.NODE_ENV === "production" ? "" : "//localhost:8080";
+			const webserver = process.env.NODE_ENV === "production" ? "" : "//" + hostname + ":8080";
 			output = Transmit.injectIntoMarkup(output, reactData, [`${webserver}/dist/client.js`]);
 
 			reply(output);

webpack.client-watch.js

@@ -1,16 +1,18 @@
 var webpack = require("webpack");
 var config = require("./webpack.client.js");
 
+var hostname = process.env.HOSTNAME || "localhost";
+
 config.cache = true;
 config.debug = true;
 config.devtool = "eval";
 
 config.entry.unshift(
-	"webpack-dev-server/client?http://localhost:8080",
+	"webpack-dev-server/client?http://" + hostname + ":8080",
 	"webpack/hot/only-dev-server"
 );
 
-config.output.publicPath = "http://localhost:8080/dist/";
+config.output.publicPath = "http://" + hostname + ":8080/dist/";
 config.output.hotUpdateMainFilename = "update/[hash]/update.json";
 config.output.hotUpdateChunkFilename = "update/[hash]/[id].update.js";
 
@@ -28,7 +30,7 @@ config.module = {
 };
 
 config.devServer = {
-	publicPath:  "http://localhost:8080/dist/",
+	publicPath:  "http://" + hostname + ":8080/dist/",
 	contentBase: "./static",
 	hot:         true,
 	inline:      true,
@@ -37,7 +39,7 @@ config.devServer = {
 	noInfo:      false,
 	headers:     {"Access-Control-Allow-Origin": "*"},
 	stats:       {colors: true},
-	host:        "0.0.0.0"
+	host:        hostname
 };
 
 module.exports = config;