1.0.6

dist/smartnginx.snippets.js

@@ -1,5 +1,6 @@
 "use strict";
 const plugins = require("./smartnginx.plugins");
+const paths = require("./smartnginx.paths");
 exports.getBaseConfigString = () => {
     let baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
@@ -63,7 +64,7 @@ exports.getBaseConfigString = () => {
 			# Virtual Host Configs
 			##
 
-			include /etc/nginx/conf.d/*.conf;
+			include ${paths.nginxHostFileBase}/*.conf;
 			include /etc/nginx/sites-enabled/*;
 		}
 		daemon off;
@@ -85,8 +86,8 @@ exports.getHostConfigString = (hostNameArg, destinationIpArg) => {
 		server {
 			listen *:443 ssl;
 			server_name ${hostNameArg};
-			ssl_certificate /LE_CERTS/${hostNameArg}/fullchain.pem;
-			ssl_certificate_key /LE_CERTS/${hostNameArg}/privkey.pem;
+			ssl_certificate ${paths.nginxCertBase}/${hostNameArg}/fullchain.pem;
+			ssl_certificate_key ${paths.nginxCertBase}/${hostNameArg}/privkey.pem;
 
 			location / {
 				proxy_pass http://${hostNameArg};
@@ -99,4 +100,4 @@ exports.getHostConfigString = (hostNameArg, destinationIpArg) => {
 	`);
     return hostConfig;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5zbmlwcGV0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguc25pcHBldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDckMsMkJBQW1CLEdBQUc7SUFDaEMsSUFBSSxVQUFVLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFrRXJELENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFBO0FBR1UsMkJBQW1CLEdBQUcsQ0FBQyxXQUFrQixFQUFDLGdCQUF1QjtJQUMzRSxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7YUFDMUMsV0FBVztZQUNaLGdCQUFnQjs7Ozs7aUJBS1gsV0FBVzs4QkFDRSxXQUFXOzs7OztpQkFLeEIsV0FBVzsrQkFDRyxXQUFXO21DQUNQLFdBQVc7Ozt3QkFHdEIsV0FBVzs7Ozs7OztFQU9qQyxDQUFDLENBQUM7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDO0FBQ25CLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRuZ2lueC5zbmlwcGV0cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0bmdpbnguc25pcHBldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLE1BQVksT0FBTyxXQUFNLHNCQUFzQixDQUFDLENBQUE7QUFDaEQsTUFBWSxLQUFLLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUNqQywyQkFBbUIsR0FBRztJQUNoQyxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O2FBOEQxQyxLQUFLLENBQUMsaUJBQWlCOzs7O0VBSWxDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFBO0FBR1UsMkJBQW1CLEdBQUcsQ0FBQyxXQUFrQixFQUFDLGdCQUF1QjtJQUMzRSxJQUFJLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUM7YUFDMUMsV0FBVztZQUNaLGdCQUFnQjs7Ozs7aUJBS1gsV0FBVzs4QkFDRSxXQUFXOzs7OztpQkFLeEIsV0FBVztxQkFDUCxLQUFLLENBQUMsYUFBYSxJQUFJLFdBQVc7eUJBQzlCLEtBQUssQ0FBQyxhQUFhLElBQUksV0FBVzs7O3dCQUduQyxXQUFXOzs7Ozs7O0VBT2pDLENBQUMsQ0FBQztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUM7QUFDbkIsQ0FBQyxDQUFDIn0=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartnginx",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "control nginx from node, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -22,17 +22,17 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartnginx#README",
   "dependencies": {
-    "@types/q": "^0.0.27",
-    "@types/shelljs": "^0.3.27",
-    "beautylog": "^5.0.18",
-    "cert": "1.0.6",
+    "@types/q": "0.x.x",
+    "@types/shelljs": "0.x.x",
+    "beautylog": "^5.0.20",
+    "cert": "^1.0.7",
     "q": "^1.4.1",
-    "shelljs": "^0.7.1",
-    "smartfile": "^4.0.12",
+    "shelljs": "^0.7.3",
+    "smartfile": "^4.0.13",
     "smartstring": "^2.0.15"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.6",
+    "npmts-g": "^5.2.8",
     "qenv": "^1.0.8",
     "should": "^10.0.0",
     "typings-test": "^1.0.1"

ts/smartnginx.snippets.ts

@@ -1,4 +1,5 @@
 import * as plugins from "./smartnginx.plugins";
+import * as paths from "./smartnginx.paths";
 export let getBaseConfigString = () => {
 	let baseConfig = plugins.smartstring.indent.normalize(`
 		user www-data;
@@ -62,7 +63,7 @@ export let getBaseConfigString = () => {
 			# Virtual Host Configs
 			##
 
-			include /etc/nginx/conf.d/*.conf;
+			include ${paths.nginxHostFileBase}/*.conf;
 			include /etc/nginx/sites-enabled/*;
 		}
 		daemon off;
@@ -86,8 +87,8 @@ export let getHostConfigString = (hostNameArg:string,destinationIpArg:string) =>
 		server {
 			listen *:443 ssl;
 			server_name ${hostNameArg};
-			ssl_certificate /LE_CERTS/${hostNameArg}/fullchain.pem;
-			ssl_certificate_key /LE_CERTS/${hostNameArg}/privkey.pem;
+			ssl_certificate ${paths.nginxCertBase}/${hostNameArg}/fullchain.pem;
+			ssl_certificate_key ${paths.nginxCertBase}/${hostNameArg}/privkey.pem;
 
 			location / {
 				proxy_pass http://${hostNameArg};