Merge branch 'develop' into up-list

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+	"editor.insertSpaces": false,
+	"editor.tabSize": 4,
+	"files.eol": "\n"
+}

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Anu Rahul Nandhan a.k.a Muthu Kumar & CodeFeathers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -30,21 +30,18 @@ Install `up` from npm:
 
 ## Commands
 
-`up static <domain>` - Create new static server at current folder.
+Format: `up command <required> [optional]`
 
-`up proxy <domain> <port>` - Create new proxy server listening at said port.
-
-`up list` - List currently available servers. (Doesn't work yet)
-
-`up kill <domain>` - Kill the server for this domain.
+- `up static <domain> [outbound port]` - Create new static server at current folder.
+- `up proxy <domain> <inbound port> [outbound port]` - Create new proxy server listening at said port.
+- `up list` - List currently available servers. (Doesn't work yet)
+- `up kill <domain>` - Kill the server for this domain.
 
 ## Examples
 
-`up static example.com` will serve a static website from current folder.
-
-`up proxy example.com 8081` will create a reverse proxy listening at port 8081.
-
-`up kill example.com`
+- `up static example.com` will serve a static website from current folder.
+- `up proxy example.com 8081` will create a reverse proxy listening at port 8081.
+- `up kill example.com`
 
 ## Contributors, Collaborators, and Guides
 

index.js

@@ -18,8 +18,9 @@ var appendToList = require('./utils/listFile').appendToList;
 var readServers = require('./utils/listFile').readServers;
 
 var EOL = require('os').EOL;
+// Check for requirements such as OS version and nginx install. Throw and exit if requirements not found.
+// #Roadmap: Add ability to satisfy any possible requirements.
 
-// Check for requirements such as OS version and nginx install. Throw and exit if requirements not found. #Roadmap: Add ability to satisfy any possible requirements.
 requirements(); // Comment in development and uncomment this line in production. This should check whether the OS is compatible with this version of `up`
 
 program

package.json

@@ -34,5 +34,8 @@
 		"prettyjson": "^1.2.1",
 		"shelljs": "^0.7.8",
 		"validator": "^9.1.1"
+	},
+	"devDependencies": {
+		"eslint": "^4.10.0"
 	}
 }

utils/nginxPath.js

@@ -2,7 +2,7 @@
 
 var enabled = "/etc/nginx/sites-enabled/";
 var conf = "/etc/nginx/conf.d/";
-var wwwRoot = "/var/www/";
+var wwwRoot = "/etc/up-serve/static/";
 
 function enabledSites() {
 	return enabled;