updated server

config/config.json

@@ -13,6 +13,11 @@
 	"security":{
 		"salt":"angular-cms"
 	},
+	"https":{
+		"key": "./config/apache.key",
+		"cert":"./config/apache.crt"
+	},
+
 	"db":{
 		"name":"angular-cms",
 		"username":"amadmin",

routes/cms-proxy.js

@@ -1,3 +1,77 @@
+var fs = require('fs'),
+	util = require('util'),
+	httpProxy = require('http-proxy');
+
+
 module.exports = function (config, app) {
 	console.warn( 'cms-proxy', 'initialized' );
+
+	/**
+	* @TODO - HTTPS Key and Cert
+	*
+	* This is the location of your https cert and key.
+	*/
+	var httpsKey = fs.readFileSync(config.https.key).toString();
+	var httpsCert = fs.readFileSync(config.https.cert).toString();
+
+
+	/**
+	* @TODO - Proxy Options
+	* This object holds options used for creating a proxy server.
+	*/
+	var options = {
+		port: null,
+		host: {
+			hostname: 'localhost',
+			port: 8181
+		},
+		proxy: {
+			hostname: 'localhost',
+			port: 5001
+		},
+		api: {
+			hostname: 'localhost',
+			port: 5151
+		},
+		key: httpsKey,
+		cert: httpsCert,
+		hostncmsOnly: true,
+		router: {}
+	};
+
+	//Create proxy server and proxy requests
+	var proxyServer = httpProxy.createServer(options, function(req, res, proxy) {
+
+		console.log('Proxy server started on port: ' + options.host.port);
+
+		// console.log('proxyServer', options);
+		if (req.url.match(/^\/api\//)) {
+			proxy.proxyRequest(req, res, {
+				host: '127.0.0.1',
+				port: options.api.port
+			});
+			util.log('Routing request: API server'.warn);
+		}
+		else if (req.url.match(/^\/1\//)) {
+
+			/* Default express server */
+			proxy.proxyRequest(req, res, {
+				host: 'api.parse.com'
+			});
+			util.log('Routing request: Parse Server'.warn);
+
+		} else {
+
+			/* Default express server */
+			proxy.proxyRequest(req, res, {
+				host: '127.0.0.1',
+				port: options.api.port
+			});
+			util.log('Routing request: App Server'.warn);
+		}
+	});
+
+
+	//Start the proxy server
+	proxyServer.listen(config.proxy.port);
 };

routes/cms-server.js

@@ -2,6 +2,7 @@ var express = require('express'),
 		path = require('path'),
 		bodyParser = require( 'body-parser' );
 
+
 module.exports = function (config, app) {
 	console.warn( 'cms-server initialized');
 
@@ -19,6 +20,8 @@ module.exports = function (config, app) {
 		}
 	};
 
+
+
 	router.use(express.static(config.staticDir, options));
 	app.all('/', function(req, res, next) {
 		res.header('Access-Control-Allow-Origin', '*');

server.js

@@ -2,93 +2,10 @@
  * Server - This is the Node.js Server.
  * @object
  */
-var fs = require('fs'),
-	util = require('util'),
-	http = require('http'),
-	express = require('express'),
-	httpProxy = require('http-proxy'),
-	app = express();
-
-
-/**
- * @TODO - Externalize configuration for server and proxy, mongodb
- */
+var express = require('express');
+var fs = require('fs');
+var cmsRouter = require('./routes/cms-router.js');
+var app = express();
 var config = JSON.parse(fs.readFileSync('./config/config.json'));
-
-
-/**
- * @TODO - HTTPS Key and Cert
- *
- * This is the location of your https cert and key.
- */
-var httpsKey = fs.readFileSync('./config/apache.key').toString();
-var httpsCert = fs.readFileSync('./config/apache.crt').toString();
-
-/**
- * @TODO - Proxy Options
- * This object holds options used for creating a proxy server.
- */
-var options = {
-	port: null,
-	host: {
-		hostname: 'localhost',
-		port: 8181
-	},
-	proxy: {
-		hostname: 'localhost',
-		port: 5001
-	},
-	api: {
-		hostname: 'localhost',
-		port: 5151
-	},
-	key: httpsKey,
-	cert: httpsCert,
-	hostncmsOnly: true,
-	router: {}
-};
-
-
-
-
-var cmsRoutes = require('./routes/cms-routes');
-	cmsRoutes.mount(config, app);
-
-
-
-
-//Create proxy server and proxy requests
-var proxyServer = httpProxy.createServer(options, function(req, res, proxy) {
-
-	console.log('Proxy server started on port: ' + options.host.port);
-
-	// console.log('proxyServer', options);
-	if (req.url.match(/^\/api\//)) {
-		proxy.proxyRequest(req, res, {
-			host: '127.0.0.1',
-			port: options.api.port
-		});
-		util.log('Routing request: API server'.warn);
-	}
-	else if (req.url.match(/^\/1\//)) {
-
-		/* Default express server */
-		proxy.proxyRequest(req, res, {
-			host: 'api.parse.com'
-		});
-		util.log('Routing request: Parse Server'.warn);
-
-	} else {
-
-		/* Default express server */
-		proxy.proxyRequest(req, res, {
-			host: '127.0.0.1',
-			port: options.api.port
-		});
-		util.log('Routing request: App Server'.warn);
-	}
-});
-
-
-//Start the proxy server
-proxyServer.listen(process.env.PORT, process.env.IP);
+var server = new cmsRouter.mount(config, app);
+console.log(server);