2.0.14

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnginx",
-  "version": "2.0.11",
+  "version": "2.0.14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -89,6 +89,16 @@
         "symbol-tree": "^3.2.2"
       }
     },
+    "@pushrocks/qenv": {
+      "version": "3.0.2",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fqenv/-/qenv-3.0.2.tgz",
+      "integrity": "sha512-gXW9Cib6izqY7W1MssryFBrjIoKwadftjv5G3y/BE4LboCkGazqjMJsea6z6G79rwvX1M+yxEEcIdIsDvBBSiA==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartfile": "^6.0.6",
+        "@pushrocks/smartlog": "^2.0.9"
+      }
+    },
     "@pushrocks/smartcli": {
       "version": "3.0.7",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartcli/-/smartcli-3.0.7.tgz",
@@ -322,7 +332,7 @@
     },
     "@types/which": {
       "version": "1.3.1",
-      "resolved": "https://verdaccio.lossless.one/@types%2fwhich/-/which-1.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.1.tgz",
       "integrity": "sha512-ZrJDWpvg75LTGX4XwuneY9s6bF3OeZcGTpoGh3zDV9ytzcHMFsRrMIaLBRJZQMBoGyKs6unBQfVdrLZiYfb1zQ=="
     },
     "@types/yargs": {
@@ -633,16 +643,6 @@
         "type-detect": "^4.0.0"
       }
     },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "dev": true,
-      "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -663,30 +663,6 @@
         "once": "^1.4.0"
       }
     },
-    "es-abstract": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
-      }
-    },
     "es6-error": {
       "version": "4.1.1",
       "resolved": "https://verdaccio.lossless.one/es6-error/-/es6-error-4.1.1.tgz",
@@ -751,12 +727,6 @@
         "readable-stream": "^2.0.2"
       }
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://verdaccio.lossless.one/form-data/-/form-data-2.3.3.tgz",
@@ -782,12 +752,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
     "get-caller-file": {
       "version": "1.0.3",
       "resolved": "https://verdaccio.lossless.one/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -828,15 +792,6 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
     "has-ansi": {
       "version": "2.0.0",
       "resolved": "https://verdaccio.lossless.one/has-ansi/-/has-ansi-2.0.0.tgz",
@@ -860,15 +815,6 @@
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
-    "home": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/home/-/home-1.0.1.tgz",
-      "integrity": "sha1-lqQjzrSbmDeP9e886uBZpVf53TU=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.1"
-      }
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -889,18 +835,6 @@
       "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
       "dev": true
     },
-    "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
-    },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://verdaccio.lossless.one/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -918,27 +852,12 @@
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
       "dev": true
     },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://verdaccio.lossless.one/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
-    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -1025,12 +944,6 @@
         "path-exists": "^3.0.0"
       }
     },
-    "lodash": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-      "dev": true
-    },
     "luxon": {
       "version": "1.9.0",
       "resolved": "https://verdaccio.lossless.one/luxon/-/luxon-1.9.0.tgz",
@@ -1149,22 +1062,6 @@
       "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
       "dev": true
     },
-    "object-keys": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
-      "dev": true
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
-      }
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1173,12 +1070,6 @@
         "wrappy": "1"
       }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
     "os-locale": {
       "version": "3.1.0",
       "resolved": "https://verdaccio.lossless.one/os-locale/-/os-locale-3.1.0.tgz",
@@ -1287,17 +1178,6 @@
         "once": "^1.3.1"
       }
     },
-    "qenv": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/qenv/-/qenv-1.1.7.tgz",
-      "integrity": "sha1-0D+L+P43SUzwjQkZ/nZdyoTZr64=",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.4",
-        "smartfile": "^4.2.11",
-        "typings-global": "^1.0.16"
-      }
-    },
     "randomatic": {
       "version": "3.1.1",
       "resolved": "https://verdaccio.lossless.one/randomatic/-/randomatic-3.1.1.tgz",
@@ -1344,12 +1224,6 @@
       "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
       "dev": true
     },
-    "require-reload": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/require-reload/-/require-reload-0.2.2.tgz",
-      "integrity": "sha1-KadZGEbK+RtuijzamRaD+V+NfUI=",
-      "dev": true
-    },
     "resolve": {
       "version": "1.9.0",
       "resolved": "https://verdaccio.lossless.one/resolve/-/resolve-1.9.0.tgz",
@@ -1419,74 +1293,6 @@
         "chai-string": "^1.4.0"
       }
     },
-    "smartfile": {
-      "version": "4.2.28",
-      "resolved": "https://registry.npmjs.org/smartfile/-/smartfile-4.2.28.tgz",
-      "integrity": "sha512-zUeAOLYftz8xLfKTs9U1NOuNPTA9jlvTQNr7lDIv84kXnr1AEpDb2Xwy1MdK1w733sBil/RkxtezrkvgRVAnNg==",
-      "dev": true,
-      "requires": {
-        "@types/fs-extra": "5.0.0",
-        "@types/vinyl": "^2.0.2",
-        "fs-extra": "^5.0.0",
-        "glob": "^7.1.2",
-        "js-yaml": "^3.10.0",
-        "require-reload": "0.2.2",
-        "smartpath": "^3.2.8",
-        "smartq": "^1.1.6",
-        "smartrequest": "^1.0.8",
-        "vinyl-file": "^3.0.0"
-      },
-      "dependencies": {
-        "@types/fs-extra": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-5.0.0.tgz",
-          "integrity": "sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*"
-          }
-        },
-        "fs-extra": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
-      }
-    },
-    "smartpath": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/smartpath/-/smartpath-3.2.8.tgz",
-      "integrity": "sha1-SDS9OouuIpW6rK26I8h6UBlS+UA=",
-      "dev": true,
-      "requires": {
-        "home": "^1.0.1",
-        "typings-global": "^1.0.14"
-      }
-    },
-    "smartq": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/smartq/-/smartq-1.1.8.tgz",
-      "integrity": "sha512-FURlYW/C3bLeZjJcBVyw7bxCyQoCXiXbLCZcDUKznhXHaLu35c8m33/a2H8CA0rtb82lvzN8dRLnBZAcNMzNHQ==",
-      "dev": true,
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
-    },
-    "smartrequest": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/smartrequest/-/smartrequest-1.0.13.tgz",
-      "integrity": "sha512-OHrvzaxaA8Z8bJr33yxnyJF35nrWyaumsajqXm2Zkv0/2hfWO1NQAj02VVV51rLQfmtU0Hex7Nk19SoC8nOmYg==",
-      "dev": true,
-      "requires": {
-        "smartq": "^1.1.1"
-      }
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://verdaccio.lossless.one/source-map/-/source-map-0.6.1.tgz",
@@ -1650,12 +1456,6 @@
       "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==",
       "dev": true
     },
-    "typings-global": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/typings-global/-/typings-global-1.0.28.tgz",
-      "integrity": "sha512-6VOwJWEY2971HOMHu/7sURzUXiD4/LiMJPsMAOqkHHAtS3MVpLFE5gzTiHilsH9KY5VE1mBQirWIgWFsDuo90A==",
-      "dev": true
-    },
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -1666,16 +1466,6 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
     "vinyl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnginx",
-  "version": "2.0.11",
+  "version": "2.0.14",
   "private": false,
   "description": "control nginx from node, TypeScript ready",
   "main": "dist/index.js",
@@ -35,8 +35,8 @@
     "@gitzone/tsbuild": "^2.1.4",
     "@gitzone/tsrun": "^1.1.17",
     "@gitzone/tstest": "^1.0.18",
+    "@pushrocks/qenv": "^3.0.2",
     "@pushrocks/tapbundle": "^3.0.7",
-    "qenv": "^1.1.7",
     "tslint": "^5.12.0",
     "tslint-config-prettier": "^1.17.0"
   }

test/test.ts

@@ -1,10 +1,10 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 import path = require('path');
 
-import { Qenv } from 'qenv';
-let testQenv = new Qenv(process.cwd(), path.join(process.cwd(), '.nogit'));
+import { Qenv } from '@pushrocks/qenv';
+const testQenv = new Qenv('./', './.nogit/');
 
-import * as smartnginx from '../ts';
+import * as smartnginx from '../ts/index';
 
 let testSmartNginx: smartnginx.SmartNginx;
 let testNginxZone01: smartnginx.NginxHost;

ts/smartnginx.snippets.ts

@@ -4,7 +4,7 @@ export let getBaseConfigString = () => {
   let baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
 		worker_processes auto;
-		pid /run/nginx.pid;
+		pid /run/nginx/nginx.pid;
 
 		events {
 			worker_connections 768;
@@ -90,8 +90,11 @@ export let getHostConfigString = (hostNameArg: string, destinationIpArg: string)
 			ssl_certificate_key ${paths.nginxHostDirPath}/${hostNameArg}.private.pem;
 
 			location / {
+				proxy_set_header Host $http_host;
+				proxy_set_header X-Real-IP $remote_addr;
+				proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+				proxy_set_header X-Forwarded-Proto $scheme;
 				proxy_pass http://${hostNameArg};
-				include /etc/nginx/proxy_params;
 			}
 			location ~ /\.git {
 				deny all;