tweak format of "env" content for simplicity

app.js

@@ -98,16 +98,16 @@ app.use(function(req, res, next) {
 	res.locals.session = req.session;
 	res.locals.debug = env.debug;
 
-	if (env.bitcoind && env.bitcoind.rpc) {
-		req.session.host = env.bitcoind.host;
-		req.session.port = env.bitcoind.port;
-		req.session.username = env.bitcoind.rpc.username;
+	if (env.rpc) {
+		req.session.host = env.rpc.host;
+		req.session.port = env.rpc.port;
+		req.session.username = env.rpc.username;
 
 		global.client = new bitcoinCore({
-			host: env.bitcoind.host,
-			port: env.bitcoind.port,
-			username: env.bitcoind.rpc.username,
-			password: env.bitcoind.rpc.password,
+			host: env.rpc.host,
+			port: env.rpc.port,
+			username: env.rpc.username,
+			password: env.rpc.password,
 			timeout: 5000
 		});
 	}

app/env.js

@@ -24,15 +24,13 @@ module.exports = {
 		"walletpassphrasechange"
 	],
 
-	// Uncomment "bitcoind" below to automatically connect via RPC.
+	// Uncomment "rpc" below to automatically connect via RPC.
 	// Otherwise, you can manually connect via the UI.
 
-	//bitcoind:{
-	//	host:"192.168.1.100",
-	//	port:8332,
-	//	rpc: {
-	//		username:"username",
-	//		password:"password"
-	//	}
-	//}
+	/*rpc: {
+		host:"127.0.0.1",
+		port:8332,
+		username:"rpc-username",
+		password:"rpc-password"
+	}*/
 };

routes/baseActionsRouter.js

@@ -45,7 +45,7 @@ router.get("/", function(req, res) {
 			res.render("index");
 		});
 	}).catch(function(err) {
-		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.bitcoind.host + ":" + env.bitcoind.port;
+		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.rpc.host + ":" + env.rpc.port;
 
 		res.render("index");
 	});
@@ -69,22 +69,22 @@ router.get("/node-details", function(req, res) {
 					res.render("node-details");
 
 				}).catch(function(err) {
-					res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.bitcoind.host + ":" + env.bitcoind.port;
+					res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.rpc.host + ":" + env.rpc.port;
 
 					res.render("node-details");
 				});
 			}).catch(function(err) {
-				res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.bitcoind.host + ":" + env.bitcoind.port;
+				res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.rpc.host + ":" + env.rpc.port;
 
 				res.render("node-details");
 			});
 		}).catch(function(err) {
-			res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.bitcoind.host + ":" + env.bitcoind.port;
+			res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.rpc.host + ":" + env.rpc.port;
 
 			res.render("node-details");
 		});
 	}).catch(function(err) {
-		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.bitcoind.host + ":" + env.bitcoind.port;
+		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.rpc.host + ":" + env.rpc.port;
 
 		res.render("node-details");
 	});
@@ -102,7 +102,7 @@ router.get("/mempool-summary", function(req, res) {
 			res.render("mempool-summary");
 		});
 	}).catch(function(err) {
-		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.bitcoind.host + ":" + env.bitcoind.port;
+		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.rpc.host + ":" + env.rpc.port;
 
 		res.render("mempool-summary");
 	});
@@ -212,7 +212,7 @@ router.get("/blocks", function(req, res) {
 			res.render("blocks");
 		});
 	}).catch(function(err) {
-		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.bitcoind.host + ":" + env.bitcoind.port;
+		res.locals.userMessage = "Unable to connect to Bitcoin Node at " + env.rpc.host + ":" + env.rpc.port;
 
 		res.render("blocks");
 	});

views/terminal.pug

@@ -6,7 +6,7 @@ block content
 			h1 RPC Terminal
 
 		div(class="col")
-			if (!env.bitcoind || !env.bitcoind.rpc)
+			if (!env.rpc || !env.rpc.rpc)
 				span(style="float: right;")
 					a(href="/disconnect") Disconnect from node