Merge branch '1.x' into 2.x

2016-10-20 22:34:04 -06:00 · 2016-10-20 22:34:04 -06:00 · 4aa9814dc6
parent 411d7adc20 1cbe94b610
commit 4aa9814dc6
2 changed files with 3 additions and 3 deletions
--- a/bin/serve-https.js
+++ b/bin/serve-https.js
--- a/package.json
+++ b/package.json
@ -2,12 +2,12 @@
  "name": "serve-https",
  "version": "2.0.2",
  "description": "Serves HTTPS using TLS (SSL) certs for localhost.daplie.com - great for testing and development.",
-  "main": "serve.js",
+  "main": "bin/serve-https.js",
  "scripts": {
-    "test": "node serve.js -p 1443 -d /tmp/"
+    "test": "node bin/serve-https.js -p 8443 -d /tmp/"
  },
  "bin": {
-    "serve-https": "serve.js"
+    "serve-https": "./bin/serve-https.js"
  },
  "repository": {
    "type": "git",